Re: UPDATE: audio/faad
Stuart Henderson wrote:
> I did a test bulk with this, the diff I am using is below (merged from
> the two posted diffs). Most things were OK but libquicktime fails:
>
>
> configure:17628: checking for faad.h usability for faad2
> configure:17657: cc -o conftest -O2 -pipe -I/usr/local/include -I/usr/X11R6/in
> clude -L/usr/local/lib -L/usr/X11R6/lib conftest.c -lpthread -lm -lz -lfaad -
> lm >&5
> In file included from conftest.c:60:
> /usr/local/include/faad.h:32:9: warning: please update faad2 include filename
> and function names! [-W#pragma-messages]
> #pragma message("please update faad2 include filename and function names!")
> ^
>
well, this is weird :)
libquicktime configure scripts does a sscanf on FAAD_VERSION expecting
something like %d.%d. FAAD_VERSION now is "unknown".
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile31 Mar 2022 16:45:26 - 1.65
+++ Makefile7 Aug 2022 14:09:14 -
@@ -1,7 +1,7 @@
COMMENT= library for reading and writing QuickTime files
DISTNAME= libquicktime-1.2.4
-REVISION= 16
+REVISION= 17
CATEGORIES=multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
@@ -17,7 +17,7 @@ WANTLIB += Xdmcp Xext Xfixes Xi Xinerama
WANTLIB += Xt Xv Xxf86vm avcodec avutil c cairo drm dv expat faad
WANTLIB += ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gsm gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl jpeg m mp3lame
+WANTLIB += gsm gtk-x11-2.0 harfbuzz iconv intl jpeg m mp3lame mp4v2
WANTLIB += ogg opus pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread sndio speex ${COMPILER_LIBCXX}
WANTLIB += swresample swscale vorbisenc vorbisfile vpx x264 x265
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/multimedia/libquicktime/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -r1.14 patch-configure
--- patches/patch-configure 11 Mar 2022 19:39:21 - 1.14
+++ patches/patch-configure 7 Aug 2022 14:06:05 -
@@ -1,5 +1,8 @@
configure.orig Thu Mar 29 15:45:15 2012
-+++ configure Mon Apr 2 19:49:37 2012
+FAAD2_VERSION is "unknown" now, the sscanf test fails.
+
+Index: configure
+--- configure.orig
configure
@@ -14951,7 +14951,7 @@ fi
VORBIS_LIBS="-L$prefix/lib"
fi
@@ -21,3 +24,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame" >&5
+@@ -17592,12 +17588,8 @@ else
+ #include
+ main()
+ {
+-int faad_major;
+-int faad_minor;
+ faacDecHandle dec;
+
+-if(sscanf(FAAD2_VERSION, "%d.%d", _major, _minor) < 2)
+- return -1;
+ dec = faacDecOpen();
+ if(!dec)
+ return -1;
Re: UPDATE: audio/faad
I did a test bulk with this, the diff I am using is below (merged from
the two posted diffs). Most things were OK but libquicktime fails:
configure:17628: checking for faad.h usability for faad2
configure:17657: cc -o conftest -O2 -pipe -I/usr/local/include -I/usr/X11R6/in
clude -L/usr/local/lib -L/usr/X11R6/lib conftest.c -lpthread -lm -lz -lfaad -
lm >&5
In file included from conftest.c:60:
/usr/local/include/faad.h:32:9: warning: please update faad2 include filename
and function names! [-W#pragma-messages]
#pragma message("please update faad2 include filename and function names!")
^
Index: Makefile
===
RCS file: /cvs/ports/audio/faad/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile11 Mar 2022 18:20:09 - 1.62
+++ Makefile3 Aug 2022 13:03:10 -
@@ -3,23 +3,23 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
COMMENT= MPEG-2 and MPEG-4 AAC decoder
-V= 2.7
-DISTNAME= faad2-${V}
-PKGNAME= faad-${V}
-REVISION= 2
-CATEGORIES=audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-EXTRACT_SUFX= .tar.bz2
+GH_ACCOUNT=knik0
+GH_PROJECT=faad2
+GH_TAGNAME=2_10_0
-SHARED_LIBS= faad3.0 \
- mp4ff 2.0
+PKGNAME= faad-${GH_TAGNAME:S/_/./g}
+
+CATEGORIES=audio
+
+SHARED_LIBS += faad 4.0 # 2.0
+SHARED_LIBS += faad_drm 0.0 # 2.0
HOMEPAGE= http://www.audiocoding.com/
# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= c m
+WANTLIB= c m mp4v2
# bootstrap checks for libtoolize
BUILD_DEPENDS+=${MODGNU_AUTOCONF_DEPENDS} \
@@ -27,16 +27,13 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPEND
devel/libtool
USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.61
-AUTOMAKE_VERSION= 1.9
+CONFIGURE_STYLE= autoreconf
+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
+CONFIGURE_ARGS+=--with-mpeg4ip
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-post-extract:
- @mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
-
-post-patch:
- @cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
+LIB_DEPENDS = multimedia/libmp4v2
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/faad/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo18 Jan 2015 03:12:40 - 1.7
+++ distinfo3 Aug 2022 13:02:40 -
@@ -1,2 +1,2 @@
-SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
-SIZE (faad2-2.7.tar.bz2) = 901043
+SHA256 (faad2-2_10_0.tar.gz) = DG2WNslvlcfXNvCX1BiCnO2OxtvYmcxsyCtyhICoS/s=
+SIZE (faad2-2_10_0.tar.gz) = 803225
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.3
diff -u -p -r1.3 patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 11 Mar 2022 18:20:09 -
1.3
+++ patches/patch-common_mp4ff_Makefile_am 3 Aug 2022 13:02:40 -
@@ -1,13 +0,0 @@
common/mp4ff/Makefile.am.orig Fri Feb 6 09:24:21 2009
-+++ common/mp4ff/Makefile.am Thu May 10 19:02:20 2012
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
-
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
-
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
Index: patches/patch-common_mp4ff_mp4ff_h
===
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_mp4ff_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-common_mp4ff_mp4ff_h
--- patches/patch-common_mp4ff_mp4ff_h 11 Mar 2022 18:20:09 - 1.2
+++ patches/patch-common_mp4ff_mp4ff_h 3 Aug 2022 13:02:40 -
@@ -1,14 +0,0 @@
common/mp4ff/mp4ff.h.orig Mon May 14 17:05:03 2012
-+++ common/mp4ff/mp4ff.h Mon May 14 17:05:27 2012
-@@ -35,11 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#ifdef HAVE_STDINT_H
- #include
--#else
--#include "mp4ff_int_types.h"
--#endif
-
- /* file callback structure */
- typedef struct
Index: patches/patch-common_mp4ff_mp4ffint_h
===
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_mp4ffint_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-common_mp4ff_mp4ffint_h
--- patches/patch-common_mp4ff_mp4ffint_h 11 Mar 2022 18:20:09 -
1.2
+++ patches/patch-common_mp4ff_mp4ffint_h 3 Aug 2022 13:02:40 -
@@ -1,11 +0,0 @@
common/mp4ff/mp4ffint.h.orig Mon
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 =
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. forgot to mention that the diff also drops libmad in favour of libmpg123. I've never used deadbeef and couldn't test since now audio doesn't work, but I've found libmpg123 generally better than libmad. Not particularly important, but i thought of pointing it out :)
Re: UPDATE: audio/faad
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.
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
+++ Makefile10 Jul 2022 20:26:04 -
@@ -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 += ${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 sndfile
+WANTLIB += speex ssl swresample theoradec theoraenc 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 += xml2 xvidcore z zip zstd
COMPILER = base-clang ports-gcc base-gcc
@@ -42,19 +41,19 @@ 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/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,7 +72,7 @@ CONFIGURE_ARGS += --disable-static \
--disable-coreaudio \
--disable-gme \
--disable-gtk2 \
- --disable-libmpg123 \
+ --disable-libmad \
--disable-mono2stereo \
--disable-oss \
--disable-pulse \
@@ -91,13 +90,8 @@ CONFIGURE_ENV += CPPFLAGS='-I${LOCALBASE
CONFIGURE_ENV += ax_cv_c_flags__msse2='no'
.endif
-post-patch:
- @mkdir -p
Re: UPDATE: audio/faad
Rafael Sadowski wrote:
> Please find below an update diff for faad2.
>
> All consumers tested. OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/faad/Makefile,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 Makefile
> --- Makefile 11 Mar 2022 18:20:09 - 1.62
> +++ Makefile 6 Jul 2022 06:04:56 -
> @@ -3,16 +3,16 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
>
> COMMENT= MPEG-2 and MPEG-4 AAC decoder
>
> -V= 2.7
> -DISTNAME=faad2-${V}
> -PKGNAME= faad-${V}
> -REVISION=2
> -CATEGORIES= audio
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=faac/}
> -EXTRACT_SUFX=.tar.bz2
> +GH_ACCOUNT= knik0
> +GH_PROJECT= faad2
> +GH_TAGNAME= 2_10_0
>
> -SHARED_LIBS= faad3.0 \
> - mp4ff 2.0
> +PKGNAME= faad-${GH_TAGNAME:S/_/./g}
> +
> +CATEGORIES= audio
> +
> +SHARED_LIBS += faad 4.0 # 2.0
> +SHARED_LIBS += faad_drm 0.0 # 2.0
>
> HOMEPAGE=http://www.audiocoding.com/
>
> @@ -27,16 +27,12 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPEND
> devel/libtool
>
> USE_GMAKE= Yes
> -CONFIGURE_STYLE= gnu
> -AUTOCONF_VERSION= 2.61
> -AUTOMAKE_VERSION= 1.9
> +CONFIGURE_STYLE= autoreconf
> +AUTOCONF_VERSION= 2.71
> +AUTOMAKE_VERSION= 1.16
> +AUTORECONF= ./bootstrap
The default autoreconf spell seems to work, so you may drop this.
> +CONFIGURE_ARGS +=--with-mpeg4ip
The configure fails to pick up libmp4v2 which is required for this
plugin.
I don't use faad so no idea if it's important to keep or not, but it's
easy to correct the configure script.
--- Makefile.orig Sun Jul 10 19:45:18 2022
+++ MakefileSun Jul 10 20:03:03 2022
@@ -19,7 +19,7 @@
# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= c m
+WANTLIB= c m mp4v2
# bootstrap checks for libtoolize
BUILD_DEPENDS+=${MODGNU_AUTOCONF_DEPENDS} \
@@ -30,9 +30,10 @@
CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.71
AUTOMAKE_VERSION= 1.16
-AUTORECONF=./bootstrap
-CONFIGURE_ARGS += --with-mpeg4ip
+CONFIGURE_ARGS+=--with-mpeg4ip
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+LIB_DEPENDS = multimedia/libmp4v2
.include
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 10 Jul 2022 18:00:37 -
@@ -0,0 +1,26 @@
+fix libmp4v2 detection
+
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -122,16 +122,11 @@ MY_CHECK_TYPEDEF_FROM_INCLUDE([float32_t temp],
+
+ AC_CHECK_FUNCS(strsep)
+
+-AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
+ AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, false)
+-if test x$WITHMPEG4IP = xyes; then
+- if test x$external_mp4v2 = xyes; then
+- AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
+- AC_MSG_NOTICE("Building MPEG4IP plugin")
+- else
+- AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")
+- fi
+-fi
++AC_CHECK_LIB(mp4v2, MP4Info, [],
++[AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
++ AC_MSG_NOTICE("Building MPEG4IP plugin")]
++[AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")])
+
+ if test x$WITHXMMS = xyes; then
+ AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
Re: UPDATE: audio/faad
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:
> > Please find below an update diff for faad2.
> >
> > All consumers tested. OK?
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/faad/Makefile,v
> > retrieving revision 1.62
> > diff -u -p -u -p -r1.62 Makefile
> > --- Makefile11 Mar 2022 18:20:09 - 1.62
> > +++ Makefile6 Jul 2022 06:04:56 -
> > @@ -3,16 +3,16 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
> >
> > COMMENT= MPEG-2 and MPEG-4 AAC decoder
> >
> > -V= 2.7
> > -DISTNAME= faad2-${V}
> > -PKGNAME= faad-${V}
> > -REVISION= 2
> > -CATEGORIES=audio
> > -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
> > -EXTRACT_SUFX= .tar.bz2
> > +GH_ACCOUNT=knik0
> > +GH_PROJECT=faad2
> > +GH_TAGNAME=2_10_0
> >
> > -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.
Re: UPDATE: audio/faad
On Sun, Jul 10, 2022 at 04:36:13PM +0200, Rafael Sadowski wrote:
> Please find below an update diff for faad2.
>
> All consumers tested. OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/faad/Makefile,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 Makefile
> --- Makefile 11 Mar 2022 18:20:09 - 1.62
> +++ Makefile 6 Jul 2022 06:04:56 -
> @@ -3,16 +3,16 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
>
> COMMENT= MPEG-2 and MPEG-4 AAC decoder
>
> -V= 2.7
> -DISTNAME=faad2-${V}
> -PKGNAME= faad-${V}
> -REVISION=2
> -CATEGORIES= audio
> -MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=faac/}
> -EXTRACT_SUFX=.tar.bz2
> +GH_ACCOUNT= knik0
> +GH_PROJECT= faad2
> +GH_TAGNAME= 2_10_0
>
> -SHARED_LIBS= faad3.0 \
> - mp4ff 2.0
This will break audio/deadbeef
UPDATE: audio/faad
Please find below an update diff for faad2.
All consumers tested. OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/faad/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- Makefile11 Mar 2022 18:20:09 - 1.62
+++ Makefile6 Jul 2022 06:04:56 -
@@ -3,16 +3,16 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
COMMENT= MPEG-2 and MPEG-4 AAC decoder
-V= 2.7
-DISTNAME= faad2-${V}
-PKGNAME= faad-${V}
-REVISION= 2
-CATEGORIES=audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-EXTRACT_SUFX= .tar.bz2
+GH_ACCOUNT=knik0
+GH_PROJECT=faad2
+GH_TAGNAME=2_10_0
-SHARED_LIBS= faad3.0 \
- mp4ff 2.0
+PKGNAME= faad-${GH_TAGNAME:S/_/./g}
+
+CATEGORIES=audio
+
+SHARED_LIBS += faad 4.0 # 2.0
+SHARED_LIBS += faad_drm 0.0 # 2.0
HOMEPAGE= http://www.audiocoding.com/
@@ -27,16 +27,12 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPEND
devel/libtool
USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.61
-AUTOMAKE_VERSION= 1.9
+CONFIGURE_STYLE= autoreconf
+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
+AUTORECONF=./bootstrap
+CONFIGURE_ARGS += --with-mpeg4ip
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
-post-extract:
- @mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
-
-post-patch:
- @cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/faad/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo18 Jan 2015 03:12:40 - 1.7
+++ distinfo6 Jul 2022 06:04:56 -
@@ -1,2 +1,2 @@
-SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
-SIZE (faad2-2.7.tar.bz2) = 901043
+SHA256 (faad2-2_10_0.tar.gz) = DG2WNslvlcfXNvCX1BiCnO2OxtvYmcxsyCtyhICoS/s=
+SIZE (faad2-2_10_0.tar.gz) = 803225
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file: patches/patch-common_mp4ff_Makefile_am
diff -N patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 11 Mar 2022 18:20:09 -
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
common/mp4ff/Makefile.am.orig Fri Feb 6 09:24:21 2009
-+++ common/mp4ff/Makefile.am Thu May 10 19:02:20 2012
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
-
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
-
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
Index: patches/patch-common_mp4ff_mp4ff_h
===
RCS file: patches/patch-common_mp4ff_mp4ff_h
diff -N patches/patch-common_mp4ff_mp4ff_h
--- patches/patch-common_mp4ff_mp4ff_h 11 Mar 2022 18:20:09 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
common/mp4ff/mp4ff.h.orig Mon May 14 17:05:03 2012
-+++ common/mp4ff/mp4ff.h Mon May 14 17:05:27 2012
-@@ -35,11 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#ifdef HAVE_STDINT_H
- #include
--#else
--#include "mp4ff_int_types.h"
--#endif
-
- /* file callback structure */
- typedef struct
Index: patches/patch-common_mp4ff_mp4ffint_h
===
RCS file: patches/patch-common_mp4ff_mp4ffint_h
diff -N patches/patch-common_mp4ff_mp4ffint_h
--- patches/patch-common_mp4ff_mp4ffint_h 11 Mar 2022 18:20:09 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
common/mp4ff/mp4ffint.h.orig Mon May 14 17:06:54 2012
-+++ common/mp4ff/mp4ffint.hMon May 14 17:07:25 2012
-@@ -35,7 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#include "mp4ff_int_types.h"
-+#include
- #include
-
- #define MAX_TRACKS 1024
Index: patches/patch-frontend_Makefile_am
===
RCS file: patches/patch-frontend_Makefile_am
diff -N patches/patch-frontend_Makefile_am
--- patches/patch-frontend_Makefile_am 11 Mar 2022 18:20:09 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
frontend/Makefile.am.orig Fri Feb 6 11:03:37 2009
-+++ frontend/Makefile.am Mon May 14 16:55:55 2012
-@@ -1,12 +1,11 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man_MANS = faad.1
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- -I$(top_srcdir)/common/mp4ff
-
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--
Re: update audio/faad
On Tue, Apr 06, 2010 at 08:28:06PM +0100, Federico G. Schwindt wrote: On Tue, Apr 06, 2010 at 05:49:20PM +0200, Tobias Ulmer wrote: On Tue, Apr 06, 2010 at 04:46:03PM +0200, Jasper Lievisse Adriaanse wrote: what's the deal with this? it broke something or it was just forgotten about? The faad port lacks header files required to use libmp4ff. The only user is audacious-plugins. It works there because audacious-plugins has its own copy of mp4ff and links against this port but uses its own header files. Things that would need to be done: - commit patch below - teach audacious-plugins to use the proper includes (- AFAIR a-p picks up libshout if installed, could be fixed in one go) - mpd likely requires LIB_DEPENDS adjusting There's a mpd update sitting in my inbox. I could look at these issues and prepare patches if you help. i thought i commited a fix for this in audacious-plugins.. maybe i'm wrong. btw, i have an update for a-p that i need to cleanup. f.- audacious-plugins still builds, so i'd like to get the faad diff in. ok? -- Stay Hungry. Stay Foolish.
Re: update audio/faad
what's the deal with this? it broke something or it was just forgotten
about?
cheers,
jasper
On Sun, Sep 06, 2009 at 03:32:42AM +0200, Tobias Ulmer wrote:
This installs mp4ff headers required for a new mpd version.
I've already made such a patch some time ago, but there have been some
tears because it broke audacious-plugins. This happend because faad
doesn't install mp4ff properly, and instead of fixing it, everyone
thinks it's a good idea to ship their own bastardized version of faad.
audacious-plugins builds with this change now, but please test!
Tobias
Index: Makefile
===
RCS file: /nfs/titan/data0/cvs/openbsd/ports/audio/faad/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile 10 Aug 2009 06:29:52 - 1.39
+++ Makefile 6 Sep 2009 00:58:26 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC deco
COMMENT-xmms=XMMS input plugin for AAC files
V= 2.6.1
DISTNAME=faad2-${V}
-PKGNAME-main=faad-${V}
+PKGNAME-main=faad-${V}p0
PKGNAME-xmms=faad-xmms-${V}p0
CATEGORIES= audio
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=faac/}
@@ -66,5 +66,7 @@ post-configure:
post-install:
@${INSTALL_DATA} ${WRKSRC}/faadconfig.h ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/common/mp4ff/mp4ff.h ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/common/mp4ff/mp4ff_int_types.h
${PREFIX}/include
.include bsd.port.mk
Index: pkg/PLIST-main
===
RCS file: /nfs/titan/data0/cvs/openbsd/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main6 Sep 2009 01:17:15 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
--
Stay Hungry. Stay Foolish.
Re: update audio/faad
On Tue, Apr 06, 2010 at 04:46:03PM +0200, Jasper Lievisse Adriaanse wrote:
what's the deal with this? it broke something or it was just forgotten
about?
The faad port lacks header files required to use libmp4ff. The only user
is audacious-plugins. It works there because audacious-plugins has its
own copy of mp4ff and links against this port but uses its own header
files.
Things that would need to be done:
- commit patch below
- teach audacious-plugins to use the proper includes
(- AFAIR a-p picks up libshout if installed, could be fixed in one go)
- mpd likely requires LIB_DEPENDS adjusting
There's a mpd update sitting in my inbox. I could look at these issues
and prepare patches if you help.
cheers,
jasper
On Sun, Sep 06, 2009 at 03:32:42AM +0200, Tobias Ulmer wrote:
This installs mp4ff headers required for a new mpd version.
I've already made such a patch some time ago, but there have been some
tears because it broke audacious-plugins. This happend because faad
doesn't install mp4ff properly, and instead of fixing it, everyone
thinks it's a good idea to ship their own bastardized version of faad.
audacious-plugins builds with this change now, but please test!
Tobias
Index: Makefile
===
RCS file: /nfs/titan/data0/cvs/openbsd/ports/audio/faad/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile10 Aug 2009 06:29:52 - 1.39
+++ Makefile6 Sep 2009 00:58:26 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC deco
COMMENT-xmms= XMMS input plugin for AAC files
V= 2.6.1
DISTNAME= faad2-${V}
-PKGNAME-main= faad-${V}
+PKGNAME-main= faad-${V}p0
PKGNAME-xmms= faad-xmms-${V}p0
CATEGORIES=audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
@@ -66,5 +66,7 @@ post-configure:
post-install:
@${INSTALL_DATA} ${WRKSRC}/faadconfig.h ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/common/mp4ff/mp4ff.h ${PREFIX}/include
+ @${INSTALL_DATA} ${WRKSRC}/common/mp4ff/mp4ff_int_types.h
${PREFIX}/include
.include bsd.port.mk
Index: pkg/PLIST-main
===
RCS file: /nfs/titan/data0/cvs/openbsd/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main 6 Sep 2009 01:17:15 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
--
Stay Hungry. Stay Foolish.
Re: update audio/faad
On Tue, Apr 06, 2010 at 05:49:20PM +0200, Tobias Ulmer wrote: On Tue, Apr 06, 2010 at 04:46:03PM +0200, Jasper Lievisse Adriaanse wrote: what's the deal with this? it broke something or it was just forgotten about? The faad port lacks header files required to use libmp4ff. The only user is audacious-plugins. It works there because audacious-plugins has its own copy of mp4ff and links against this port but uses its own header files. Things that would need to be done: - commit patch below - teach audacious-plugins to use the proper includes (- AFAIR a-p picks up libshout if installed, could be fixed in one go) - mpd likely requires LIB_DEPENDS adjusting There's a mpd update sitting in my inbox. I could look at these issues and prepare patches if you help. i thought i commited a fix for this in audacious-plugins.. maybe i'm wrong. btw, i have an update for a-p that i need to cleanup. f.-
Re: update: audio/faad
On Sat, Jan 31, 2009 at 02:10:53AM +0100, Tobias Ulmer wrote:
bah wrong patch, here's the correct version:
this apparently breaks audio/audacious-plugins
Index: Makefile
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.38
diff -u -p Makefile
--- Makefile 15 Sep 2008 21:58:19 - 1.38
+++ Makefile 31 Jan 2009 00:23:41 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
COMMENT-xmms=XMMS input plugin for AAC files
V= 2.6.1
DISTNAME=faad2-${V}
-PKGNAME-main=faad-${V}
+PKGNAME-main=faad-${V}p0
PKGNAME-xmms=faad-xmms-${V}
CATEGORIES= audio
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file:
/nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.1
diff -u -p patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am15 Sep 2008 21:58:19 -
1.1
+++ patches/patch-common_mp4ff_Makefile_am31 Jan 2009 01:06:41 -
@@ -1,9 +1,14 @@
$OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19 jakemsr
Exp $
common/mp4ff/Makefile.am.origFri Jul 11 14:17:17 2008
-+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
+--- common/mp4ff/Makefile.am.origSun May 7 20:09:00 2006
common/mp4ff/Makefile.am Sat Jan 31 02:00:12 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LTLIBRARIES = libmp4ff.la
libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
+mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+drms.h drms.c drmstables.h
+
++include_HEADERS=mp4ff.h mp4ff_int_types.h
Index: pkg/PLIST-main
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main31 Jan 2009 01:06:41 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audio/faad
On Sat, Jan 31, 2009 at 11:17:33AM +, Jacob Meuser wrote:
On Sat, Jan 31, 2009 at 02:10:53AM +0100, Tobias Ulmer wrote:
bah wrong patch, here's the correct version:
this apparently breaks audio/audacious-plugins
Because they ship their own mp4ff_int_types.h, which is modified
to include the top-level config.h, causing breakage if it's not there.
Compiling against modified headers, then linking against an external
lib is wrong, but i'm sure you know that ;-)
Index: Makefile
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.38
diff -u -p Makefile
--- Makefile15 Sep 2008 21:58:19 - 1.38
+++ Makefile31 Jan 2009 00:23:41 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
COMMENT-xmms= XMMS input plugin for AAC files
V= 2.6.1
DISTNAME= faad2-${V}
-PKGNAME-main= faad-${V}
+PKGNAME-main= faad-${V}p0
PKGNAME-xmms= faad-xmms-${V}
CATEGORIES=audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file:
/nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.1
diff -u -p patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 15 Sep 2008 21:58:19 -
1.1
+++ patches/patch-common_mp4ff_Makefile_am 31 Jan 2009 01:06:41 -
@@ -1,9 +1,14 @@
$OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19 jakemsr
Exp $
common/mp4ff/Makefile.am.orig Fri Jul 11 14:17:17 2008
-+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
+--- common/mp4ff/Makefile.am.orig Sun May 7 20:09:00 2006
common/mp4ff/Makefile.am Sat Jan 31 02:00:12 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LTLIBRARIES = libmp4ff.la
libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
+mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+drms.h drms.c drmstables.h
+
++include_HEADERS=mp4ff.h mp4ff_int_types.h
Index: pkg/PLIST-main
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main 15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main 31 Jan 2009 01:06:41 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audio/faad
On Sat, Jan 31, 2009 at 02:57:08PM +0100, Tobias Ulmer wrote:
On Sat, Jan 31, 2009 at 11:17:33AM +, Jacob Meuser wrote:
On Sat, Jan 31, 2009 at 02:10:53AM +0100, Tobias Ulmer wrote:
bah wrong patch, here's the correct version:
this apparently breaks audio/audacious-plugins
Because they ship their own mp4ff_int_types.h, which is modified
to include the top-level config.h, causing breakage if it's not there.
Compiling against modified headers, then linking against an external
lib is wrong, but i'm sure you know that ;-)
proposing a patch that breaks the one and only dependency, for whatever
reason, isn't exactly right either.
Index: Makefile
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.38
diff -u -p Makefile
--- Makefile 15 Sep 2008 21:58:19 - 1.38
+++ Makefile 31 Jan 2009 00:23:41 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
COMMENT-xmms=XMMS input plugin for AAC files
V= 2.6.1
DISTNAME=faad2-${V}
-PKGNAME-main=faad-${V}
+PKGNAME-main=faad-${V}p0
PKGNAME-xmms=faad-xmms-${V}
CATEGORIES= audio
MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file:
/nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.1
diff -u -p patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am15 Sep 2008 21:58:19
- 1.1
+++ patches/patch-common_mp4ff_Makefile_am31 Jan 2009 01:06:41
-
@@ -1,9 +1,14 @@
$OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19
jakemsr Exp $
common/mp4ff/Makefile.am.origFri Jul 11 14:17:17 2008
-+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
+--- common/mp4ff/Makefile.am.origSun May 7 20:09:00 2006
common/mp4ff/Makefile.am Sat Jan 31 02:00:12 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LTLIBRARIES = libmp4ff.la
libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
+mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+drms.h drms.c drmstables.h
+
++include_HEADERS=mp4ff.h mp4ff_int_types.h
Index: pkg/PLIST-main
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main31 Jan 2009 01:06:41 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
update: audio/faad
don't just install libmp4ff without headers, include them. this is
required for the mpd update everyone is moaning about...
Index: Makefile
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.38
diff -u -p Makefile
--- Makefile15 Sep 2008 21:58:19 - 1.38
+++ Makefile31 Jan 2009 00:23:41 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
COMMENT-xmms= XMMS input plugin for AAC files
V= 2.6.1
DISTNAME= faad2-${V}
-PKGNAME-main= faad-${V}
+PKGNAME-main= faad-${V}p0
PKGNAME-xmms= faad-xmms-${V}
CATEGORIES=audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file:
/nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.1
diff -u -p patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 15 Sep 2008 21:58:19 -
1.1
+++ patches/patch-common_mp4ff_Makefile_am 31 Jan 2009 00:23:41 -
@@ -1,9 +1,14 @@
$OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19 jakemsr Exp
$
common/mp4ff/Makefile.am.orig Fri Jul 11 14:17:17 2008
-+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
+--- common/mp4ff/Makefile.am.orig Sun May 7 20:09:00 2006
common/mp4ff/Makefile.am Sat Jan 31 01:16:17 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LTLIBRARIES = libmp4ff.la
libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
+mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+drms.h drms.c drmstables.h
+
++include_HEADERS=mp4ff.h mp4ffint.h
Index: pkg/PLIST-main
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main 15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main 31 Jan 2009 00:23:41 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ffint.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
Re: update: audio/faad
bah wrong patch, here's the correct version:
Index: Makefile
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.38
diff -u -p Makefile
--- Makefile15 Sep 2008 21:58:19 - 1.38
+++ Makefile31 Jan 2009 00:23:41 -
@@ -4,7 +4,7 @@ COMMENT-main= MPEG-2 and MPEG-4 AAC decoder
COMMENT-xmms= XMMS input plugin for AAC files
V= 2.6.1
DISTNAME= faad2-${V}
-PKGNAME-main= faad-${V}
+PKGNAME-main= faad-${V}p0
PKGNAME-xmms= faad-xmms-${V}
CATEGORIES=audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
Index: patches/patch-common_mp4ff_Makefile_am
===
RCS file:
/nfs/obsd0/cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.1
diff -u -p patches/patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 15 Sep 2008 21:58:19 -
1.1
+++ patches/patch-common_mp4ff_Makefile_am 31 Jan 2009 01:06:41 -
@@ -1,9 +1,14 @@
$OpenBSD: patch-common_mp4ff_Makefile_am,v 1.1 2008/09/15 21:58:19 jakemsr Exp
$
common/mp4ff/Makefile.am.orig Fri Jul 11 14:17:17 2008
-+++ common/mp4ff/Makefile.am Fri Jul 11 14:17:37 2008
+--- common/mp4ff/Makefile.am.orig Sun May 7 20:09:00 2006
common/mp4ff/Makefile.am Sat Jan 31 02:00:12 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libmp4ff.la
+lib_LTLIBRARIES = libmp4ff.la
libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+@@ -6,3 +6,4 @@ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4s
+mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
+drms.h drms.c drmstables.h
+
++include_HEADERS=mp4ff.h mp4ff_int_types.h
Index: pkg/PLIST-main
===
RCS file: /nfs/obsd0/cvs/ports/audio/faad/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main 15 Sep 2008 21:58:19 - 1.2
+++ pkg/PLIST-main 31 Jan 2009 01:06:41 -
@@ -6,6 +6,8 @@
@bin bin/faad
include/faad.h
include/faadconfig.h
+include/mp4ff.h
+include/mp4ff_int_types.h
include/neaacdec.h
lib/libfaad.a
lib/libfaad.la
