Re: update audio/deadbeef (was Re: UPDATE: audio/faad)
Stuart Henderson wrote: > On 2022/08/03 16:41, Stuart Henderson wrote: > > On 2022/08/03 11:35, Omar Polo wrote: > > > woops, forgot to rm files/*, sorry, updated diff. > > > > How about keep them around but disabled, so it's easier if someone wants > > to fix it? This adds in the bits needed to allow it to build. Other tweaks: sure, it's a good idea. I hope it'll be easier for someone(tm) to bring back an sndio driver this way :) > > No need for BUILD_DEPENDS on autoconf etc, it's added by autoreconf. > > No need for base-gcc in COMPILER, ffmpeg won't build with base-gcc anyway. agreed on both, and sorry for missing them. > oops, old diff well, it builds and i can listen to some music, so ok for me! :) Thanks! Omar Polo
Re: update audio/deadbeef (was Re: UPDATE: audio/faad)
On 2022/08/03 16:41, Stuart Henderson wrote:
> On 2022/08/03 11:35, Omar Polo wrote:
> > woops, forgot to rm files/*, sorry, updated diff.
>
> How about keep them around but disabled, so it's easier if someone wants
> to fix it? This adds in the bits needed to allow it to build. Other tweaks:
> No need for BUILD_DEPENDS on autoconf etc, it's added by autoreconf.
> No need for base-gcc in COMPILER, ffmpeg won't build with base-gcc anyway.
oops, old diff
Index: Makefile
===
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile31 Mar 2022 14:10:58 - 1.45
+++ Makefile3 Aug 2022 15:41:48 -
@@ -1,37 +1,35 @@
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
+COMPILER = base-clang ports-gcc
+
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
EXTRACT_SUFX = .tar.bz2
MODULES = textproc/intltool
-BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS += devel/yasm
.endif
@@ -42,19 +40,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 +62,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,16 +72,20 @@ CONFIGURE_ARGS += --disable-static \
--disable-coreaudio \
--disable-gme \
--disable-gtk2 \
- --disable-libmpg123 \
+ --disable-libmad \
--disable-mono2stereo \
Re: update audio/deadbeef (was Re: UPDATE: audio/faad)
On 2022/08/03 11:35, Omar Polo wrote:
> woops, forgot to rm files/*, sorry, updated diff.
How about keep them around but disabled, so it's easier if someone wants
to fix it? This adds in the bits needed to allow it to build. Other tweaks:
No need for BUILD_DEPENDS on autoconf etc, it's added by autoreconf.
No need for base-gcc in COMPILER, ffmpeg won't build with base-gcc anyway.
Index: Makefile
===
RCS file: /cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile31 Mar 2022 14:10:58 - 1.45
+++ Makefile3 Aug 2022 15:38:39 -
@@ -1,37 +1,35 @@
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
+DEBUG_PACKAGES = ${BUILD_PACKAGES}
+
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=deadbeef/}
EXTRACT_SUFX = .tar.bz2
MODULES = textproc/intltool
-BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS}
-
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS += devel/yasm
.endif
@@ -42,19 +40,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 +62,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,16 +72,20 @@ CONFIGURE_ARGS += --disable-static \
--disable-coreaudio \
--disable-gme \
--disable-gtk2 \
- --disable-libmpg123 \
+ --disable-libmad \
--disable-mono2stereo \
--disable-oss \
- --disable-pulse \
--disable-sid \
Re: update audio/deadbeef (was Re: UPDATE: audio/faad)
Omar Polo wrote:
> Omar Polo wrote:
> > Rafael Sadowski 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= faad3.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
--- Makefile31 Mar 2022 14:10:58 - 1.45
+++ Makefile3 Aug 2022 09:05:52 -
@@ -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
update audio/deadbeef (was Re: UPDATE: audio/faad)
Omar Polo wrote:
> Rafael Sadowski 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= faad3.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?
Index: Makefile
===
RCS file: /home/cvs/ports/audio/deadbeef/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile31 Mar 2022 14:10:58 - 1.45
+++ Makefile3 Aug 2022 09:05:52 -
@@ -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 =
