Omar Polo <op@openbsd.org> wrote:
> Omar Polo <op@openbsd.org> wrote:
> > Rafael Sadowski <rafael@sizeofvoid.org> wrote:
> > > On Sun Jul 10, 2022 at 04:46:43PM +0200, Antoine Jacoutot wrote:
> > > > On Sun, Jul 10, 2022 at 04:36:13PM +0200, Rafael Sadowski wrote:
> > > > > [...]
> > > > > -SHARED_LIBS= faad 3.0 \
> > > > > - mp4ff 2.0
> > > >
> > > > This will break audio/deadbeef
> > > >
> > >
> > > Yes, I realized that I send the email to ports@. Doh! This will break
> > > some ports. If anybody want to help, feel free and try to update
> > > deadbeef.
> >
> > I gave it a try; patch belows in an attempt at updating deadbeef.
> > unfortunately, upstream first merged and then removed the sndio support:
> >
> > https://github.com/DeaDBeeF-Player/deadbeef/issues/2079
> >
> > so even if it compiles and starts there's no audio at all. Note that it
> > needs the port for devel/libdispatch I sent earlier. I'm testing this
> > with the updated faad ofc.
>
> Diff below enables pulseaudio (sigh) so that audio works and should
> unblock the audio/faad update (assuming the other consumers are happy
> too.)
>
> I've never used deadbeef before, i just opened it, loaded an album and
> started listening. tests by real users are welcome. note that it needs
> devel/libdispatch; you'll find it in ports@.
>
> The switch from libmad to libmpg123 is just a matter of a personal
> preference. (oh and unlike libmad mpg123 is actually maintained.)
>
> (still testing with the updated libfaad.)
>
> ok?
woops, forgot to rm files/*, sorry, updated diff.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 31 Mar 2022 14:10:58 -0000 1.45
+++ Makefile 3 Aug 2022 09:05:52 -0000
@@ -1,26 +1,25 @@
COMMENT = DeaDBeeF is an audio player
-DISTNAME = deadbeef-0.7.2
-REVISION = 14
+DISTNAME = deadbeef-1.9.1
CATEGORIES = audio
-HOMEPAGE = http://deadbeef.sourceforge.net/
+HOMEPAGE = https://deadbeef.sourceforge.io/
# GPLv2 & LGPLv2.1
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} FLAC Imlib2 X11 Xcomposite
-WANTLIB += Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi avcodec avformat avutil
-WANTLIB += bz2 c cairo cairo-gobject cddb cdio crypto curl dbus-1
-WANTLIB += epoxy expat faad ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gsm gthread-2.0 gtk-3 harfbuzz iconv intl jansson m
-WANTLIB += mad mms mp3lame mp4ff mpcdec nghttp2 ogg opus pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
-WANTLIB += sndfile sndio speex ssl swresample vorbis vorbisenc
-WANTLIB += vorbisfile vpx wavpack x264 x265 xcb xcb-render xcb-shm
-WANTLIB += xvidcore z zip fribidi Xau Xdmcp
-WANTLIB += aom dav1d execinfo jpeg lzma theoradec theoraenc xml2 zstd
+WANTLIB += ${COMPILER_LIBCXX} BlocksRuntime FLAC X11 Xau Xcomposite
+WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
+WANTLIB += Xrender aom atk-1.0 atk-bridge-2.0 avcodec avformat
+WANTLIB += avutil bz2 c cairo cairo-gobject cddb cdio crypto curl
+WANTLIB += dav1d dbus-1 dispatch epoxy execinfo expat faad ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0
+WANTLIB += gtk-3 harfbuzz iconv intl jansson jpeg lzma m mms mp3lame
+WANTLIB += mp4v2 mpcdec mpg123 nghttp2 ogg opus opusfile pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pulse
+WANTLIB += pulse-simple sndfile speex ssl swresample theoradec
+WANTLIB += theoraenc vorbis vorbisenc vorbisfile vpx wavpack x264
+WANTLIB += x265 xcb xcb-render xcb-shm xml2 xvidcore z zip zstd
COMPILER = base-clang ports-gcc base-gcc
@@ -42,19 +41,20 @@ RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = archivers/libzip \
audio/faad \
audio/flac \
+ audio/libcddb \
audio/libcdio \
- audio/libmad \
audio/libogg \
audio/libsndfile \
audio/libvorbis \
audio/musepack \
+ audio/opusfile \
+ audio/pulseaudio \
audio/wavpack \
devel/jansson \
+ devel/libdispatch \
graphics/ffmpeg \
- graphics/imlib2 \
multimedia/libmms \
net/curl \
- x11/dbus \
x11/gtk+3
USE_GMAKE = Yes
@@ -63,9 +63,9 @@ LIBTOOL_FLAGS = --tag=disable-static
NO_TEST = Yes
AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.11
+AUTOMAKE_VERSION = 1.16
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
CONFIGURE_ARGS += --disable-static \
--disable-abstract-socket \
--disable-adplug \
@@ -73,10 +73,9 @@ CONFIGURE_ARGS += --disable-static \
--disable-coreaudio \
--disable-gme \
--disable-gtk2 \
- --disable-libmpg123 \
+ --disable-libmad \
--disable-mono2stereo \
--disable-oss \
- --disable-pulse \
--disable-sid \
--disable-src \
--disable-supereq \
@@ -91,13 +90,8 @@ CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE
CONFIGURE_ENV += ax_cv_c_flags__msse2='no'
.endif
-post-patch:
- @mkdir -p ${WRKSRC}/m4 # XXX need for autoreconf
- @mkdir -p ${WRKSRC}/plugins/sndio
- @cp ${FILESDIR}/{Makefile.am,sndio.c} ${WRKSRC}/plugins/sndio
-
-pre-configure:
- @cd ${WRKSRC} && ${AUTOCONF_ENV} autoreconf
+# XXX: why is this even needed?
+MAKE_FLAGS += INTL_LIBS=-lintl
post-install:
@rm ${PREFIX}/lib/deadbeef/*.la
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/audio/deadbeef/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 13 Sep 2016 08:48:11 -0000 1.6
+++ distinfo 10 Jul 2022 17:50:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (deadbeef-0.7.2.tar.bz2) = imOr3wDC83wz4BiuCznTkYc+A3Q0B0uEu0c4G/KDyIQ=
-SIZE (deadbeef-0.7.2.tar.bz2) = 4736472
+SHA256 (deadbeef-1.9.1.tar.bz2) = 9hNminnuvJHAUKPttcrZFEryz/IMX5maZo4fPcDStCM=
+SIZE (deadbeef-1.9.1.tar.bz2) = 5136384
Index: files/Makefile.am
===================================================================
RCS file: files/Makefile.am
diff -N files/Makefile.am
--- files/Makefile.am 13 Sep 2016 08:48:11 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-if HAVE_SNDIO
-sndiodir = $(libdir)/$(PACKAGE)
-pkglib_LTLIBRARIES = sndio.la
-sndio_la_SOURCES = sndio.c
-sndio_la_LDFLAGS = -module -avoid-version
-sndio_la_LIBADD = $(LDADD) $(SNDIO_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99
-endif
Index: files/sndio.c
===================================================================
RCS file: files/sndio.c
diff -N files/sndio.c
--- files/sndio.c 8 Aug 2012 18:06:48 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,360 +0,0 @@
-/*
- * sndio - Output plugin using OpenBSD sndio API
- * Copyright (c) 2012 Alexandr Shadchin <shadchin@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <sndio.h>
-#include "../../deadbeef.h"
-
-static DB_output_t plugin;
-DB_functions_t *deadbeef;
-
-static int state = OUTPUT_STATE_STOPPED;
-static int sndio_terminate;
-static intptr_t sndio_tid;
-static uintptr_t sndio_mutex;
-
-static struct sio_hdl *hdl;
-static size_t bufsz;
-static char *buf = NULL;
-static float min_db;
-static float vol_db;
-
-static int sndio_init(void);
-static int sndio_free(void);
-static int sndio_setformat(ddb_waveformat_t *);
-static int sndio_play(void);
-static int sndio_stop(void);
-static int sndio_pause(void);
-static int sndio_unpause(void);
-static void sndio_thread(void *context);
-static int sndio_callback(char *stream, int len);
-
-static void
-vol_cb(void *unused, unsigned int newvol)
-{
- float newvol_db;
-
- newvol_db = min_db * (1 - (float)newvol / SIO_MAXVOL);
- if (newvol_db == vol_db)
- return;
- vol_db = newvol_db;
- deadbeef->volume_set_db(vol_db);
-}
-
-static void
-pause_do(void)
-{
- if (!hdl)
- return;
-
- deadbeef->mutex_lock(sndio_mutex);
- sio_stop(hdl);
- sio_start(hdl);
- deadbeef->mutex_unlock(sndio_mutex);
-}
-
-static int
-sndio_init(void)
-{
- struct sio_par par, askpar;
- int buffer_ms = deadbeef->conf_get_int("sndio.buffer", 250);
- const char *device = deadbeef->conf_get_str_fast("sndio.device", SIO_DEVANY);
-
- if (plugin.fmt.is_float) {
- fprintf(stderr, "sndio: float format is not supported\n");
- goto error;
- }
-
- hdl = sio_open(device, SIO_PLAY, 0);
- if (!hdl) {
- fprintf(stderr, "sndio: failed to open audio device\n");
- goto error;
- }
-
- sio_initpar(&par);
- par.pchan = plugin.fmt.channels;
- par.rate = plugin.fmt.samplerate;
- par.bits = plugin.fmt.bps;
- par.bps = SIO_BPS(plugin.fmt.bps);
- par.sig = 1;
- par.le = SIO_LE_NATIVE;
- par.appbufsz = par.rate * buffer_ms / 1000;
-
- /* fprintf(stderr, "sndio: %dbit %s %dch %dHz %dbps\n", par.bits, plugin.fmt.is_float ? "float" : "int", par.pchan, par.rate, par.bps); */
-
- askpar = par;
- if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
- fprintf(stderr, "sndio: failed to set parameters\n");
- goto error;
- }
-
- if ((par.bps > 1 && par.le != askpar.le) ||
- (par.bits < par.bps * 8 && !par.msb) ||
- par.bps != askpar.bps ||
- par.sig != askpar.sig ||
- par.pchan != askpar.pchan ||
- par.rate != askpar.rate) {
- fprintf(stderr, "sndio: parameters not supported\n");
- goto error;
- }
-
- bufsz = par.bps * par.pchan * par.round;
- buf = malloc(bufsz);
- if (!buf) {
- fprintf(stderr, "sndio: failed malloc buf\n");
- goto error;
- }
-
- min_db = deadbeef->volume_get_min_db();
- sio_onvol(hdl, vol_cb, NULL);
- if (!sio_start(hdl)) {
- fprintf(stderr, "sndio: failed to start audio device\n");
- goto error;
- }
-
- sndio_tid = deadbeef->thread_start(sndio_thread, NULL);
-
- return 0;
-
-error:
- sndio_free();
-
- return -1;
-}
-
-static int
-sndio_free(void)
-{
- if (sndio_tid) {
- sndio_terminate = 1;
- deadbeef->thread_join(sndio_tid);
- sndio_tid = 0;
- }
- if (hdl) {
- sio_close(hdl);
- hdl = NULL;
- }
- if (buf) {
- free(buf);
- buf = NULL;
- }
-
- state = OUTPUT_STATE_STOPPED;
- sndio_terminate = 0;
-
- return 0;
-}
-
-static int
-sndio_setformat(ddb_waveformat_t *fmt)
-{
- if (!memcmp(&plugin.fmt, fmt, sizeof(ddb_waveformat_t)))
- return 0;
-
- memcpy(&plugin.fmt, fmt, sizeof(ddb_waveformat_t));
-
- if (sndio_tid)
- sndio_free();
-
- return 0;
-}
-
-static int
-sndio_play(void)
-{
- if (!sndio_tid && sndio_init() < 0)
- return -1;
-
- state = OUTPUT_STATE_PLAYING;
-
- return 0;
-}
-
-static int
-sndio_stop(void)
-{
- if (state != OUTPUT_STATE_STOPPED) {
- state = OUTPUT_STATE_STOPPED;
- pause_do();
- }
- deadbeef->streamer_reset(1);
-
- return 0;
-}
-
-static int
-sndio_pause(void)
-{
- if (state == OUTPUT_STATE_STOPPED)
- return -1;
- else if (state != OUTPUT_STATE_PAUSED) {
- state = OUTPUT_STATE_PAUSED;
- pause_do();
- }
-
- return 0;
-}
-
-static int
-sndio_unpause(void)
-{
- state = OUTPUT_STATE_PLAYING;
-
- return 0;
-}
-
-static void
-sndio_thread(void *context)
-{
- float newvol_db;
- size_t size;
-
- while (!sndio_terminate) {
- if (state != OUTPUT_STATE_PLAYING) {
- usleep(10000);
- continue;
- }
-
- deadbeef->mutex_lock(sndio_mutex);
- newvol_db = deadbeef->volume_get_db();
- if (newvol_db != vol_db) {
- vol_db = newvol_db;
- sio_setvol(hdl, (1 - vol_db / min_db) * SIO_MAXVOL);
- }
- size = sndio_callback(buf, bufsz);
- memset(buf + size, 0, bufsz - size);
- size = sio_write(hdl, buf, bufsz);
- deadbeef->mutex_unlock(sndio_mutex);
- if (size != bufsz) {
- fprintf(stderr, "sndio: failed to write buffer\n");
- sndio_free();
- }
- }
-}
-
-static int
-sndio_callback(char *stream, int len)
-{
- return deadbeef->streamer_read(stream, len);
-}
-
-static int
-sndio_get_state(void)
-{
- return state;
-}
-
-static int
-sndio_configchanged(void)
-{
- deadbeef->conf_lock();
- deadbeef->sendmessage(DB_EV_REINIT_SOUND, 0, 0, 0);
- deadbeef->conf_unlock();
-
- return 0;
-}
-
-static int
-sndio_plugin_message(uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2)
-{
- switch (id) {
- case DB_EV_CONFIGCHANGED:
- sndio_configchanged();
- break;
- }
-
- return 0;
-}
-
-static int
-sndio_plugin_start(void)
-{
- sndio_mutex = deadbeef->mutex_create();
-
- return 0;
-}
-
-static int
-sndio_plugin_stop(void)
-{
- if (sndio_mutex) {
- deadbeef->mutex_free(sndio_mutex);
- sndio_mutex = 0;
- }
-
- return 0;
-}
-
-DB_plugin_t *
-sndio_load(DB_functions_t *api)
-{
- deadbeef = api;
-
- return DB_PLUGIN(&plugin);
-}
-
-static const char settings_dlg[] =
- "property \"Device\" entry sndio.device " SIO_DEVANY ";\n"
- "property \"Buffer size (ms)\" entry sndio.buffer 250;\n";
-
-/* define plugin interface */
-static DB_output_t plugin = {
- DB_PLUGIN_SET_API_VERSION
- .plugin.version_major = 1,
- .plugin.version_minor = 0,
- .plugin.type = DB_PLUGIN_OUTPUT,
- .plugin.id = "sndio",
- .plugin.name = "sndio output plugin",
- .plugin.descr = "plays sound through sndio library",
- .plugin.copyright =
- "Copyright (c) 2012 Alexandr Shadchin <shadchin@openbsd.org>\n"
- "\n"
- "Permission to use, copy, modify, and distribute this software for any\n"
- "purpose with or without fee is hereby granted, provided that the above\n"
- "copyright notice and this permission notice appear in all copies.\n"
- "\n"
- "THE SOFTWARE IS PROVIDED 'AS IS' AND THE AUTHOR DISCLAIMS ALL WARRANTIES\n"
- "WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF\n"
- "MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR\n"
- "ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES\n"
- "WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN\n"
- "ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF\n"
- "OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\n",
- .plugin.website = "http://www.openbsd.org/",
- .plugin.start = sndio_plugin_start,
- .plugin.stop = sndio_plugin_stop,
- .plugin.configdialog = settings_dlg,
- .plugin.message = sndio_plugin_message,
- .init = sndio_init,
- .free = sndio_free,
- .setformat = sndio_setformat,
- .play = sndio_play,
- .stop = sndio_stop,
- .pause = sndio_pause,
- .unpause = sndio_unpause,
- .state = sndio_get_state,
- .has_volume = 1,
- .fmt.samplerate = 48000,
- .fmt.channels = 2,
- .fmt.bps = 16,
- .fmt.is_float = 0,
- .fmt.channelmask = DDB_SPEAKER_FRONT_LEFT | DDB_SPEAKER_FRONT_RIGHT
-};
Index: patches/patch-Makefile_am
===================================================================
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- patches/patch-Makefile_am 11 Mar 2022 18:20:08 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- Makefile.am.orig Sun Sep 4 08:48:52 2016
-+++ Makefile.am Sun Sep 4 08:49:05 2016
-@@ -51,6 +51,9 @@ deadbeef_SOURCES =\
- sdkdir = $(pkgincludedir)
- sdk_HEADERS = deadbeef.h
-
-+# Fix 'undefined symbol' errors when loading plugins
-+deadbeef_LDFLAGS = $(LDFLAGS) -Wl,--export-dynamic
-+
- deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(INTL_LIBS) plugins/libparser/libparser.a
-
- AM_CFLAGS = $(DEPS_CFLAGS) -std=c99
Index: patches/patch-configure_ac
===================================================================
RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-configure_ac,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure_ac
--- patches/patch-configure_ac 11 Mar 2022 18:20:08 -0000 1.7
+++ patches/patch-configure_ac 10 Jul 2022 18:44:13 -0000
@@ -1,6 +1,7 @@
---- configure.ac.orig Tue Mar 15 21:20:56 2016
-+++ configure.ac Mon Sep 5 08:53:07 2016
-@@ -83,6 +83,7 @@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-als
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -84,6 +84,7 @@ AC_ARG_ENABLE(alsa, [AS_HELP_STRING([--disable-als
AC_ARG_ENABLE(oss, [AS_HELP_STRING([--disable-oss ], [disable Open Sound System output plugin (default: enabled)])], [enable_oss=$enableval], [enable_oss=yes])
AC_ARG_ENABLE(pulse, [AS_HELP_STRING([--disable-pulse ], [disable PulseAudio output plugin (default: enabled)])], [enable_pulse=$enableval], [enable_pulse=yes])
AC_ARG_ENABLE(coreaudio,[AS_HELP_STRING([--disable-coreaudio], [disable CoreAudio output plugin (default: enabled)])], [enable_coreaudio=$enableval], [enable_coreaudio=yes])
@@ -8,18 +9,18 @@
AC_ARG_ENABLE(gtk3, [AS_HELP_STRING([--disable-gtk3 ], [disable GTK3 version of gtkui plugin (default: enabled)])], [enable_gtk3=$enableval], [enable_gtk3=yes])
AC_ARG_ENABLE(gtk2, [AS_HELP_STRING([--disable-gtk2 ], [disable GTK2 version of gtkui plugin (default: enabled)])], [enable_gtk2=$enableval], [enable_gtk2=yes])
AC_ARG_ENABLE(vfs_curl, [AS_HELP_STRING([--disable-vfs-curl], [disable HTTP streaming vfs plugin (default: enabled)])], [enable_vfs_curl=$enableval], [enable_vfs_curl=yes])
-@@ -188,8 +189,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_
- PREFIXFLAGS=" -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
- ])
+@@ -193,8 +194,8 @@ AS_IF([test "${enable_portable}" != "no" -a "${enable_
+ dnl HACK: using undocumented variable to check whether it's safe to define __EXTENSIONS__
+ test $ac_cv_safe_to_define___extensions__ = yes && CFLAGS_EXTENSIONS="-D__EXTENSIONS__"
+
+-CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
+-CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
++CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS"
++CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $CFLAGS_EXTENSIONS $PREFIXFLAGS"
--CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
--CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS -DDDB_WARN_DEPRECATED=1"
-+CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE $PREFIXFLAGS"
-+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE $PREFIXFLAGS"
AS_IF([test "${enable_staticlink}" != "no"], [
- HAVE_ZLIB=yes
-@@ -287,6 +288,17 @@ AS_IF([test "${enable_coreaudio}" != "no" -a "${found_
+@@ -295,6 +296,17 @@ AS_IF([test "${enable_coreaudio}" != "no" -a "${found_
AC_SUBST(COREAUDIO_LIBS)
@@ -37,7 +38,7 @@
AS_IF([test "${enable_ffmpeg}" != "no"], [
AS_IF([test "${enable_staticlink}" != "no"], [
FFMPEG_DEPS_CFLAGS="-I../../$LIB/include"
-@@ -394,11 +406,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [
+@@ -402,11 +414,11 @@ AS_IF([test "${enable_vorbis}" != "no"], [
AC_SUBST(VORBIS_LIBS)
AC_SUBST(VORBIS_CFLAGS)
], [
@@ -52,7 +53,7 @@
AC_SUBST(VORBIS_LIBS)
])
])
-@@ -430,10 +442,10 @@ AS_IF([test "${enable_flac}" != "no"], [
+@@ -455,10 +467,10 @@ AS_IF([test "${enable_flac}" != "no"], [
AC_SUBST(FLAC_CFLAGS)
AC_SUBST(FLAC_LIBS)
], [
@@ -65,7 +66,7 @@
AC_SUBST(FLAC_LIBS)
])
])
-@@ -739,7 +751,7 @@ AS_IF([test "${enable_aac}" != "no"], [
+@@ -735,7 +747,7 @@ AS_IF([test "${enable_aac}" != "no"], [
])
AS_IF([test "${enable_mms}" != "no"], [
@@ -74,16 +75,7 @@
AC_SUBST(LIBMMS_LIBS)
HAVE_MMS=yes
])
-@@ -796,7 +808,7 @@ AS_IF([test "${enable_sc68}" != "no"], [
- HAVE_SC68=yes
- ])
-
--PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68"
-+PLUGINS_DIRS="plugins/liboggedit plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/ao plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/sndio"
-
- AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes")
- AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes")
-@@ -811,6 +823,7 @@ AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes")
+@@ -825,6 +837,7 @@ AM_CONDITIONAL(HAVE_GTK2, test "x$HAVE_GTK2" = "xyes")
AM_CONDITIONAL(HAVE_GTK3, test "x$HAVE_GTK3" = "xyes")
AM_CONDITIONAL(HAVE_ALSA, test "x$HAVE_ALSAPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_COREAUDIO, test "x$HAVE_COREAUDIO" = "xyes")
@@ -91,27 +83,3 @@
AM_CONDITIONAL(HAVE_FFMPEG, test "x$HAVE_FFMPEGPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_PULSE, test "x$HAVE_PULSEPLUGIN" = "xyes")
AM_CONDITIONAL(HAVE_ARTWORK, test "x$HAVE_ARTWORK" = "xyes")
-@@ -870,7 +883,6 @@ Makefile
- pixmaps/Makefile
- icons/Makefile
- plugins/liboggedit/Makefile
--plugins/libmp4ff/Makefile
- plugins/libparser/Makefile
- plugins/gme/Makefile
- plugins/alsa/Makefile
-@@ -916,6 +928,7 @@ plugins/wma/Makefile
- plugins/pltbrowser/Makefile
- plugins/sc68/Makefile
- plugins/coreaudio/Makefile
-+plugins/sndio/Makefile
- intl/Makefile
- po/Makefile.in
- deadbeef.desktop
-@@ -952,6 +965,7 @@ PRINT_PLUGIN_INFO([alsa],[ALSA output],[test "x$HAVE_A
- PRINT_PLUGIN_INFO([oss],[oss output plugin],[test "x$HAVE_OSS" = "xyes"])
- PRINT_PLUGIN_INFO([pulse],[PulseAudio output plugin],[test "x$HAVE_PULSEPLUGIN" = "xyes"])
- PRINT_PLUGIN_INFO([coreaudio],[CoreAudio output plugin],[test "x$HAVE_COREAUDIO" = "xyes"])
-+PRINT_PLUGIN_INFO([sndio],[sndio output plugin],[test "x$HAVE_SNDIO" = "xyes"])
- PRINT_PLUGIN_INFO([sid],[SID player based on libsidplay2],[test "x$HAVE_SID" = "xyes"])
- PRINT_PLUGIN_INFO([ffap],[Monkey's audio (APE) decoder],[test "x$HAVE_FFAP" = "xyes"])
- PRINT_PLUGIN_INFO([lastfm],[last.fm scrobbler],[test "x$HAVE_LASTFM" = "xyes"])
Index: patches/patch-junklib_c
===================================================================
RCS file: /home/cvs/ports/audio/deadbeef/patches/patch-junklib_c,v
retrieving revision 1.6
diff -u -p -r1.6 patch-junklib_c
--- patches/patch-junklib_c 11 Mar 2022 18:20:08 -0000 1.6
+++ patches/patch-junklib_c 10 Jul 2022 18:44:13 -0000
@@ -7,34 +7,13 @@ junklib: fix pointer going out of scope
Index: junklib.c
--- junklib.c.orig
+++ junklib.c
-@@ -33,7 +33,6 @@
+@@ -32,9 +32,6 @@
+ #include <stdlib.h>
#include <string.h>
- #undef HAVE_ICI
#if HAVE_ICONV
+- #ifndef __MINGW32__
- #define LIBICONV_PLUG
+-
No comments:
Post a Comment