July 2007 - crux-commits

ports/core (2.3): mktemp: added -j1 make option
by crux＠crux.nu 28 Jul '07

28 Jul '07

commit 2aebc9038a1023dccf2257ad4d0eab50d362a210 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Jul 28 10:00:13 2007 +0200 mktemp: added -j1 make option diff --git a/mktemp/Pkgfile b/mktemp/Pkgfile index fd23620..518888e 100644 --- a/mktemp/Pkgfile +++ b/mktemp/Pkgfile @@ -11,5 +11,5 @@ build() { cd $name-$version ./configure --prefix=/usr make - make prefix=$PKG/usr install + make -j1 prefix=$PKG/usr install }

1 0

ports/opt (2.3): nvidia: again, this time with the correct Pkgfile (without specific version numbers)
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit 26a9e60e73cb245e5f05fe48fd646af2638a33e1 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Jul 27 15:50:56 2007 -0500 nvidia: again, this time with the correct Pkgfile (without specific version numbers) diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile index 1dce3ab..a287a86 100644 --- a/nvidia/Pkgfile +++ b/nvidia/Pkgfile @@ -5,7 +5,7 @@ name=nvidia version=100.14.11 -release=2 +release=3 source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-… \ $name-makefile.patch) @@ -26,7 +26,7 @@ build() { cp -a usr/X11R6/lib/* $PKG/usr/lib/xorg/ cp -a usr/lib/* $PKG/usr/lib/ sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la - ln -s libnvidia-wfb.so.100.14.11 $PKG/usr/lib/xorg/modules/libwfb.so + ln -s libnvidia-wfb.so.$version $PKG/usr/lib/xorg/modules/libwfb.so # copy includes mkdir -p $PKG/usr/include/nvidia

1 0

ports/opt (2.3): gl-select: removed extraneous echo
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit edce6dc7c2de1c8ed0f9ab1c80847ca4d639ed65 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Jul 27 15:30:36 2007 -0500 gl-select: removed extraneous echo diff --git a/gl-select/.md5sum b/gl-select/.md5sum index 93c7a88..a703dab 100644 --- a/gl-select/.md5sum +++ b/gl-select/.md5sum @@ -1 +1 @@ -feb558cd1c98f66391a1501e79412987 gl-select +e7ba583aaaadff39b262b1deeee19852 gl-select diff --git a/gl-select/gl-select b/gl-select/gl-select index 8e34766..c853c46 100755 --- a/gl-select/gl-select +++ b/gl-select/gl-select @@ -86,7 +86,6 @@ case "$1" in # get the .so version number NV_VER="`pkginfo -i | grep "^nvidia " | awk '{ print $2 }' | sed -e 's/-[0-9]\+$//' | sed -e 's/-/\./'`" - echo "NV_VER=$NV_VER" # check for the existence of libglx_so and libGL_so_1_2 # if none, move the xorg stuff out of the way for nvidia's

1 0

ports/opt (2.3): nvidia: added libwfb.so symlink
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit 0d700d01370a91eedec0143976c737f6a86aebd4 Author: Matt Housh <jaeger(a)crux.nu> Date: Fri Jul 27 15:29:36 2007 -0500 nvidia: added libwfb.so symlink diff --git a/nvidia/.footprint b/nvidia/.footprint index f979f7d..d7f1c78 100644 --- a/nvidia/.footprint +++ b/nvidia/.footprint @@ -33,6 +33,7 @@ drwxr-xr-x root/root usr/lib/xorg/modules/drivers/ drwxr-xr-x root/root usr/lib/xorg/modules/extensions/ -rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.100.14.11 -rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.100.14.11 +lrwxrwxrwx root/root usr/lib/xorg/modules/libwfb.so -> libnvidia-wfb.so.100.14.11 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile index e645744..1dce3ab 100644 --- a/nvidia/Pkgfile +++ b/nvidia/Pkgfile @@ -5,7 +5,7 @@ name=nvidia version=100.14.11 -release=1 +release=2 source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-… \ $name-makefile.patch) @@ -26,6 +26,7 @@ build() { cp -a usr/X11R6/lib/* $PKG/usr/lib/xorg/ cp -a usr/lib/* $PKG/usr/lib/ sed -i -e 's|__LIBGL_PATH__|/usr/lib|' $PKG/usr/lib/libGL.la + ln -s libnvidia-wfb.so.100.14.11 $PKG/usr/lib/xorg/modules/libwfb.so # copy includes mkdir -p $PKG/usr/include/nvidia

1 0

ports/opt (2.3): wine: updated to 0.9.42
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit 4b1e703c17e959756aae3a34f3ab42dcb9d9c744 Author: Antti Nykanen <aon(a)iki.fi> Date: Fri Jul 27 21:34:25 2007 +0300 wine: updated to 0.9.42 diff --git a/wine/.footprint b/wine/.footprint index eba343b..cccfd26 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -115,6 +115,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ -rw-r--r-- root/root usr/include/wine/windows/custcntl.h -rw-r--r-- root/root usr/include/wine/windows/cvconst.h -rw-r--r-- root/root usr/include/wine/windows/d3d.h +-rw-r--r-- root/root usr/include/wine/windows/d3d10.h +-rw-r--r-- root/root usr/include/wine/windows/d3d10.idl -rw-r--r-- root/root usr/include/wine/windows/d3d8.h -rw-r--r-- root/root usr/include/wine/windows/d3d8caps.h -rw-r--r-- root/root usr/include/wine/windows/d3d8types.h @@ -191,6 +193,10 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/dxerr8.h -rw-r--r-- root/root usr/include/wine/windows/dxerr9.h -rw-r--r-- root/root usr/include/wine/windows/dxfile.h +-rw-r--r-- root/root usr/include/wine/windows/dxgi.h +-rw-r--r-- root/root usr/include/wine/windows/dxgi.idl +-rw-r--r-- root/root usr/include/wine/windows/dxgitype.h +-rw-r--r-- root/root usr/include/wine/windows/dxgitype.idl -rw-r--r-- root/root usr/include/wine/windows/dyngraph.idl -rw-r--r-- root/root usr/include/wine/windows/errors.h -rw-r--r-- root/root usr/include/wine/windows/evcode.h @@ -207,6 +213,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/gdiplusgpstubs.h -rw-r--r-- root/root usr/include/wine/windows/gdiplusinit.h -rw-r--r-- root/root usr/include/wine/windows/gdiplusmem.h +-rw-r--r-- root/root usr/include/wine/windows/gdiplusmetaheader.h -rw-r--r-- root/root usr/include/wine/windows/gdipluspixelformats.h -rw-r--r-- root/root usr/include/wine/windows/gdiplustypes.h -rw-r--r-- root/root usr/include/wine/windows/guiddef.h @@ -415,6 +422,7 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/usp10.h -rw-r--r-- root/root usr/include/wine/windows/uuids.h -rw-r--r-- root/root usr/include/wine/windows/uxtheme.h +-rw-r--r-- root/root usr/include/wine/windows/vdmdbg.h -rw-r--r-- root/root usr/include/wine/windows/ver.h -rw-r--r-- root/root usr/include/wine/windows/vfw.h -rw-r--r-- root/root usr/include/wine/windows/vfwmsgs.h diff --git a/wine/.md5sum b/wine/.md5sum index 7a1c30c..c3f09b7 100644 --- a/wine/.md5sum +++ b/wine/.md5sum @@ -1 +1 @@ -014e3760c07ac71906ba47c27f0471ab wine-0.9.41.tar.bz2 +04e53f201e5747b86751fc0abb0c0aeb wine-0.9.42.tar.bz2 diff --git a/wine/Pkgfile b/wine/Pkgfile index a5be187..ac67bc8 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -5,7 +5,7 @@ # Depends on: fontforge name=wine -version=0.9.41 +version=0.9.42 release=1 source=(http://ibiblio.org/pub/linux/system/emulators/wine/wine-$version.ta…

1 0

ports/opt (2.3): fontforge: updated to 20070723
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit cd1d3f47a6c403caad5cc185d7ed84f994d16288 Author: Antti Nykanen <aon(a)iki.fi> Date: Fri Jul 27 21:34:40 2007 +0300 fontforge: updated to 20070723 diff --git a/fontforge/.footprint b/fontforge/.footprint index f043ac8..f4218f7 100644 --- a/fontforge/.footprint +++ b/fontforge/.footprint @@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/sfddiff drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libgdraw.la -lrwxrwxrwx root/root usr/lib/libgdraw.so -> libgdraw.so.2.0.0 -lrwxrwxrwx root/root usr/lib/libgdraw.so.2 -> libgdraw.so.2.0.0 --rwxr-xr-x root/root usr/lib/libgdraw.so.2.0.0 +lrwxrwxrwx root/root usr/lib/libgdraw.so -> libgdraw.so.1.1.0 +lrwxrwxrwx root/root usr/lib/libgdraw.so.1 -> libgdraw.so.1.1.0 +-rwxr-xr-x root/root usr/lib/libgdraw.so.1.1.0 -rwxr-xr-x root/root usr/lib/libgunicode.la lrwxrwxrwx root/root usr/lib/libgunicode.so -> libgunicode.so.3.0.0 lrwxrwxrwx root/root usr/lib/libgunicode.so.3 -> libgunicode.so.3.0.0 diff --git a/fontforge/.md5sum b/fontforge/.md5sum index 6328a1a..e8262f4 100644 --- a/fontforge/.md5sum +++ b/fontforge/.md5sum @@ -1 +1 @@ -f25ab79dc5edeabeb557cdefe9b2ccc7 fontforge_full-20070607.tar.bz2 +22b6e40e72a0b0054acedee148e07a34 fontforge_full-20070723.tar.bz2 diff --git a/fontforge/Pkgfile b/fontforge/Pkgfile index 3941934..a45ef77 100644 --- a/fontforge/Pkgfile +++ b/fontforge/Pkgfile @@ -5,7 +5,7 @@ # Depends on: freetype, libpng, libtiff, libungif, libxml2 name=fontforge -version=20070607 +version=20070723 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/${name}_full-$version.t…

1 0

ports/opt (2.3): cmus: updated to 2.2.0
by crux＠crux.nu 27 Jul '07

27 Jul '07

commit 533bb0df4bea140ecfedd9dc3ccccf6fbde29d8b Author: Antti Nykanen <aon(a)iki.fi> Date: Fri Jul 27 19:33:16 2007 +0300 cmus: updated to 2.2.0 diff --git a/cmus/.footprint b/cmus/.footprint index 89a58ac..fbc2525 100644 --- a/cmus/.footprint +++ b/cmus/.footprint @@ -5,8 +5,8 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmus/ drwxr-xr-x root/root usr/lib/cmus/ip/ --rwxr-xr-x root/root usr/lib/cmus/ip/flac.so -rwxr-xr-x root/root usr/lib/cmus/ip/mad.so +-rwxr-xr-x root/root usr/lib/cmus/ip/modplug.so -rwxr-xr-x root/root usr/lib/cmus/ip/vorbis.so -rwxr-xr-x root/root usr/lib/cmus/ip/wav.so drwxr-xr-x root/root usr/lib/cmus/op/ @@ -23,5 +23,6 @@ drwxr-xr-x root/root usr/share/cmus/ -rw-r--r-- root/root usr/share/cmus/default.theme -rw-r--r-- root/root usr/share/cmus/gray-88.theme -rw-r--r-- root/root usr/share/cmus/green-mono-88.theme +-rw-r--r-- root/root usr/share/cmus/green.theme -rw-r--r-- root/root usr/share/cmus/rc -rw-r--r-- root/root usr/share/cmus/xterm-white.theme diff --git a/cmus/.md5sum b/cmus/.md5sum index 4449d99..c43cfef 100644 --- a/cmus/.md5sum +++ b/cmus/.md5sum @@ -1 +1 @@ -11ca53a05442ee073b6e790e957b1433 cmus-2.1.0.tar.bz2 +7a9895ecfc10cd16577c73051436962f cmus-2.2.0.tar.bz2 diff --git a/cmus/Pkgfile b/cmus/Pkgfile index b2c467a..47a413f 100644 --- a/cmus/Pkgfile +++ b/cmus/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: alsa-lib, flac, libao, libid3tag, libmad, libmodplug, libmpcdec, libvorbis name=cmus -version=2.1.0 +version=2.2.0 release=1 source=(http://onion.dynserv.net/~timo/files/$name-$version.tar.bz2)

1 0

ports/opt (2.3): openal: reverted to version 0.0.8 due to svn breakage
by crux＠crux.nu 26 Jul '07

26 Jul '07

commit d5d1b8683f478efdf8555d277f066c17603da886 Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Jul 26 10:35:57 2007 -0500 openal: reverted to version 0.0.8 due to svn breakage diff --git a/openal/.footprint b/openal/.footprint index 1a53212..e784eed 100644 --- a/openal/.footprint +++ b/openal/.footprint @@ -9,8 +9,8 @@ drwxr-xr-x root/root usr/include/AL/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libopenal.a -rwxr-xr-x root/root usr/lib/libopenal.la -lrwxrwxrwx root/root usr/lib/libopenal.so -> libopenal.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libopenal.so.1 -> libopenal.so.1.0.0 --rwxr-xr-x root/root usr/lib/libopenal.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libopenal.so -> libopenal.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libopenal.so.0 -> libopenal.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libopenal.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/openal.pc diff --git a/openal/.md5sum b/openal/.md5sum index e69de29..fba4524 100644 --- a/openal/.md5sum +++ b/openal/.md5sum @@ -0,0 +1 @@ +641cf53761f35ee979f3e888614797a0 openal-0.0.8.tar.gz diff --git a/openal/Pkgfile b/openal/Pkgfile index d2a34f9..8e28cc7 100644 --- a/openal/Pkgfile +++ b/openal/Pkgfile @@ -1,26 +1,15 @@ # Description: Cross-platform 3D audio # URL: http://www.openal.org/ # Maintainer: Matt Housh, jaeger at crux dot nu -# Depends on: subversion, alsa-lib, libvorbis, libsdl +# Depends on: alsa-lib, libvorbis, libsdl name=openal -version=svn -release=2 -source=() +version=0.0.8 +release=1 +source=(http://www.openal.org/openal_webstf/downloads/$name-$version.tar.gz) build() { - if [ -d $PKGMK_SOURCE_DIR/$name ] - then - svn update --config-dir . $PKGMK_SOURCE_DIR/$name - else - svn co --config-dir . \ - http://www.openal.org/repos/openal/trunk/OpenAL-Sample \ - $PKGMK_SOURCE_DIR/$name - fi - cp -a $PKGMK_SOURCE_DIR/$name $SRC/ - - cd $name - ./autogen.sh + cd $name-$version ./configure --prefix=/usr \ --exec-prefix=/usr \ --enable-optimization \

1 0

ports/opt (2.3): scorched3d: updated to version 40.1d
by crux＠crux.nu 26 Jul '07

26 Jul '07

commit 01cb0382d33e57499783d819565494b997ba4b48 Author: Matt Housh <jaeger(a)crux.nu> Date: Thu Jul 26 10:36:25 2007 -0500 scorched3d: updated to version 40.1d diff --git a/scorched3d/.md5sum b/scorched3d/.md5sum index 05c8b41..03bbc14 100644 --- a/scorched3d/.md5sum +++ b/scorched3d/.md5sum @@ -1,2 +1,2 @@ -a45c9446af99c943a19a4c9a7602531f Scorched3D-40.1c-src.tar.gz +263d2c1be168860d783426c4d6c7060c Scorched3D-40.1d-src.tar.gz f275c62a98a9eb671a91b49f38567b56 scorched3d-freealut.patch diff --git a/scorched3d/Pkgfile b/scorched3d/Pkgfile index c84de2d..995e1ec 100644 --- a/scorched3d/Pkgfile +++ b/scorched3d/Pkgfile @@ -4,7 +4,7 @@ # Depends on: sdl_mixer, sdl_net, wxgtk, freealut name=scorched3d -version=40.1c +version=40.1d release=1 source=(http://dl.sourceforge.net/$name/Scorched3D-$version-src.tar.gz \ $name-freealut.patch)

1 0

ports/opt (2.3): vorbis-tools: fixed FLAC support.
by crux＠crux.nu 26 Jul '07

26 Jul '07

commit 546234d41f652a0396f7941a93164517e7a35b0f Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Thu Jul 26 16:03:42 2007 +0200 vorbis-tools: fixed FLAC support. diff --git a/vorbis-tools/.md5sum b/vorbis-tools/.md5sum index 3fc0555..f3ae669 100644 --- a/vorbis-tools/.md5sum +++ b/vorbis-tools/.md5sum @@ -1,2 +1,2 @@ 47845fd76f5f2354a3619c4097575487 vorbis-tools-1.1.1.tar.gz -dc5a45112202819cef1870ebb8d44929 vorbis-tools.diff +8e99076ca366d8c3068903c8b2eac20d vorbis-tools.diff diff --git a/vorbis-tools/Pkgfile b/vorbis-tools/Pkgfile index f2c6862..556b487 100644 --- a/vorbis-tools/Pkgfile +++ b/vorbis-tools/Pkgfile @@ -6,16 +6,18 @@ name=vorbis-tools version=1.1.1 -release=2 +release=3 source=(http://downloads.xiph.org/releases/vorbis/$name-$version.tar.gz \ $name.diff) build() { cd $name-$version - patch -p0 -i $SRC/$name.diff + patch -p1 -i $SRC/$name.diff - ./configure --prefix=/usr --disable-nls --enable-vcut + autoconf + + ./configure --prefix=/usr --mandir=/usr/man --disable-nls --enable-vcut make make DESTDIR=$PKG install diff --git a/vorbis-tools/vorbis-tools.diff b/vorbis-tools/vorbis-tools.diff index 6822778..49cae6d 100644 --- a/vorbis-tools/vorbis-tools.diff +++ b/vorbis-tools/vorbis-tools.diff @@ -1,8 +1,11 @@ Fix compilation with latest curl. Patch stolen from NetBSD. ---- ogg123/http_transport.c.orig 2005-06-13 13:11:44.000000000 +0000 -+++ ogg123/http_transport.c +Fix compilation with FLAC 1.1.3+. +Patch stolen from Arch Linux. + +--- vorbis-tools-1.1.1.orig/ogg123/http_transport.c 2005-06-13 13:11:44.000000000 +0000 ++++ vorbis-tools-1.1.1/ogg123/http_transport.c @@ -116,7 +116,6 @@ void set_curl_opts (http_private_t *priv if (inputOpts.ProxyTunnel) curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel); @@ -11,3 +14,498 @@ Patch stolen from NetBSD. curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error); curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback); curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private); + +--- vorbis-tools-1.1.1.orig/configure.ac 2005-06-27 10:25:51.000000000 +0100 ++++ vorbis-tools-1.1.1/configure.ac 2007-04-07 17:26:15.000000000 +0100 +@@ -169,17 +169,33 @@ + + FLAC_LIBS="" + if test "x$build_flac" = xyes; then ++ + AC_CHECK_LIB(m,log,FLAC_LIBS="-lm") +- AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single], +- [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"], +- AC_MSG_WARN([libFLAC missing]) +- have_libFLAC=no, [$FLAC_LIBS] +- ) +- AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new], +- [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"], +- AC_MSG_WARN([libOggFLAC missing]) +- have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS] +- ) ++ ++ dnl First check for libFLAC-1.1.3 or later. As of libFLAC 1.1.3, ++ dnl OggFLAC functionality has been rolled into libFLAC rather ++ dnl than being in a separate libOggFLAC library. ++ ++ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_init_ogg_stream], ++ have_libFLAC=yes, have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS]) ++ ++ if test "x$have_libFLAC" = xyes; then ++ FLAC_LIBS="-lFLAC $FLAC_LIBS $OGG_LIBS" ++ else ++ dnl Check for libFLAC prior to 1.1.3 ++ AC_CHECK_LIB(FLAC, [FLAC__stream_decoder_process_single], ++ [have_libFLAC=yes; FLAC_LIBS="-lFLAC $FLAC_LIBS"], ++ AC_MSG_WARN([libFLAC missing]) ++ have_libFLAC=no, [$FLAC_LIBS] ++ ) ++ ++ AC_CHECK_LIB(OggFLAC, [OggFLAC__stream_decoder_new], ++ [FLAC_LIBS="-lOggFLAC $FLAC_LIBS $OGG_LIBS"], ++ AC_MSG_WARN([libOggFLAC missing]) ++ have_libFLAC=no, [$FLAC_LIBS $OGG_LIBS] ++ ) ++ fi ++ + AC_CHECK_HEADER(FLAC/stream_decoder.h,, + AC_MSG_WARN(libFLAC headers missing) + have_libFLAC=no,[ ]) +--- vorbis-tools-1.1.1.orig/ogg123/flac_format.c 2005-06-03 11:15:09.000000000 +0100 ++++ vorbis-tools-1.1.1/ogg123/flac_format.c 2007-04-07 17:25:14.000000000 +0100 +@@ -20,18 +20,26 @@ + #include <string.h> + #include <sys/types.h> + #include <math.h> +-#include <FLAC/metadata.h> ++#include <FLAC/all.h> + #include <ao/ao.h> + #include "audio.h" + #include "format.h" + #include "i18n.h" ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif ++#if NEED_EASYFLAC + #include "easyflac.h" ++#endif + #include "vorbis_comments.h" + +-#define DEFAULT_FLAC_FRAME_SIZE 4608 +- + typedef struct { ++#if NEED_EASYFLAC + EasyFLAC__StreamDecoder *decoder; ++#else ++ FLAC__StreamDecoder *decoder; ++ int is_oggflac; ++#endif + short channels; + int rate; + int bits_per_sample; +@@ -67,10 +75,18 @@ + + + /* Private functions declarations */ +-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); +-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); +-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#if NEED_EASYFLAC ++static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#else ++static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data); ++#endif + + void resize_buffer(flac_private_t *flac, int newchannels, int newsamples); + /*void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments);*/ +@@ -155,6 +171,7 @@ + private->buf_start = 0; + + /* Setup FLAC decoder */ ++#if NEED_EASYFLAC + if (oggflac_can_decode(source)) { + decoder->format = &oggflac_format; + private->decoder = EasyFLAC__stream_decoder_new(1); +@@ -172,13 +189,40 @@ + EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO); + EasyFLAC__set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + EasyFLAC__init(private->decoder); ++#else ++ if (oggflac_can_decode(source)) { ++ private->is_oggflac = 1; ++ decoder->format = &oggflac_format; ++ } else { ++ private->is_oggflac = 0; ++ decoder->format = &flac_format; ++ } ++ private->decoder = FLAC__stream_decoder_new(); ++ ++ FLAC__stream_decoder_set_md5_checking(private->decoder, false); ++ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_STREAMINFO); ++ FLAC__stream_decoder_set_metadata_respond(private->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); ++ /*FLAC__stream_decoder_init(private->decoder);*/ ++ if(private->is_oggflac) ++ FLAC__stream_decoder_init_ogg_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder); ++ else ++ FLAC__stream_decoder_init_stream(private->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, decoder); ++#endif + + /* Callback will set the total samples and sample rate */ ++#if NEED_EASYFLAC + EasyFLAC__process_until_end_of_metadata(private->decoder); ++#else ++ FLAC__stream_decoder_process_until_end_of_metadata(private->decoder); ++#endif + + /* Callback will set the number of channels and resize the + audio buffer */ ++#if NEED_EASYFLAC + EasyFLAC__process_single(private->decoder); ++#else ++ FLAC__stream_decoder_process_single(private->decoder); ++#endif + + /* FLAC API returns signed samples on all streams */ + decoder->actual_fmt.signed_sample = 1; +@@ -241,11 +285,19 @@ + realsamples += copy; + } + else if (!priv->eos) { ++#if NEED_EASYFLAC + ret = EasyFLAC__process_single(priv->decoder); + if (!ret || + EasyFLAC__get_state(priv->decoder) + == FLAC__STREAM_DECODER_END_OF_STREAM) + priv->eos = 1; /* Bail out! */ ++#else ++ ret = FLAC__stream_decoder_process_single(priv->decoder); ++ if (!ret || ++ FLAC__stream_decoder_get_state(priv->decoder) ++ == FLAC__STREAM_DECODER_END_OF_STREAM) ++ priv->eos = 1; /* Bail out! */ ++#endif + } else + break; + } +@@ -311,8 +363,13 @@ + free(priv->buf[i]); + + free(priv->buf); ++#if NEED_EASYFLAC + EasyFLAC__finish(priv->decoder); + EasyFLAC__stream_decoder_delete(priv->decoder); ++#else ++ FLAC__stream_decoder_finish(priv->decoder); ++ FLAC__stream_decoder_delete(priv->decoder); ++#endif + + free(decoder->private); + free(decoder); +@@ -342,7 +399,11 @@ + + + ++#if NEED_EASYFLAC + FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) ++#else ++FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -363,7 +424,11 @@ + } + + ++#if NEED_EASYFLAC + FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#else ++FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -389,7 +454,11 @@ + } + + ++#if NEED_EASYFLAC + void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#else ++void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#endif + { + decoder_t *e_decoder = client_data; + flac_private_t *priv = e_decoder->private; +@@ -409,12 +478,26 @@ + } + + ++#if NEED_EASYFLAC + void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#else ++void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#endif + { + + + } + ++#if !NEED_EASYFLAC ++FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data) ++{ ++ decoder_t *e_decoder = client_data; ++ flac_private_t *priv = e_decoder->private; ++ ++ return priv->eos; ++} ++#endif ++ + + void resize_buffer(flac_private_t *flac, int newchannels, int newsamples) + { +@@ -457,7 +540,11 @@ + + + ++#if NEED_EASYFLAC + if (EasyFLAC__is_oggflac(priv->decoder)) ++#else ++ if (priv->is_oggflac) ++#endif + cb->printf_metadata(decoder->callback_arg, 2, + _("Ogg FLAC stream: %d bits, %d channel, %ld Hz"), + priv->bits_per_sample, +--- vorbis-tools-1.1.1.orig/ogg123/easyflac.c 2005-06-03 11:15:09.000000000 +0100 ++++ vorbis-tools-1.1.1/ogg123/easyflac.c 2007-04-07 17:25:26.000000000 +0100 +@@ -33,10 +33,12 @@ + * + */ + ++#include <FLAC/export.h> ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++ + #include <stdlib.h> + #include "easyflac.h" + +- + FLAC__bool EasyFLAC__is_oggflac(EasyFLAC__StreamDecoder *decoder) + { + return decoder->is_oggflac; +@@ -373,3 +375,5 @@ + else + return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac); + } ++ ++#endif +--- vorbis-tools-1.1.1.orig/oggenc/flac.c 2005-06-03 11:15:10.000000000 +0100 ++++ vorbis-tools-1.1.1/oggenc/flac.c 2007-04-07 18:17:27.000000000 +0100 +@@ -20,15 +20,25 @@ + #include "platform.h" + #include "resample.h" + +-#define DEFAULT_FLAC_FRAME_SIZE 4608 ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif ++ ++#if NEED_EASYFLAC ++static FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++#else ++static FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data); ++static FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); ++static void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); ++static void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); ++static FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data); ++#endif + +-FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data); +-FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data); +-void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data); +-void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); +- +-void resize_buffer(flacfile *flac, int newchannels, int newsamples); +-void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments); ++static void resize_buffer(flacfile *flac, int newchannels, int newsamples); ++static void copy_comments (vorbis_comment *v_comments, FLAC__StreamMetadata_VorbisComment *f_comments); + + + int flac_id(unsigned char *buf, int len) +@@ -76,6 +86,7 @@ + flac->in = in; + + /* Setup FLAC decoder */ ++#if NEED_EASYFLAC + flac->decoder = EasyFLAC__stream_decoder_new(oggflac_id(oldbuf, buflen)); + EasyFLAC__set_client_data(flac->decoder, flac); + EasyFLAC__set_read_callback(flac->decoder, &easyflac_read_callback); +@@ -85,14 +96,32 @@ + EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); + EasyFLAC__set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); + EasyFLAC__init(flac->decoder); ++#else ++ flac->decoder = FLAC__stream_decoder_new(); ++ FLAC__stream_decoder_set_md5_checking(flac->decoder, false); ++ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_STREAMINFO); ++ FLAC__stream_decoder_set_metadata_respond(flac->decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT); ++ if(oggflac_id(oldbuf, buflen)) ++ FLAC__stream_decoder_init_ogg_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac); ++ else ++ FLAC__stream_decoder_init_stream(flac->decoder, read_callback, /*seek_callback=*/0, /*tell_callback=*/0, /*length_callback=*/0, eof_callback, write_callback, metadata_callback, error_callback, flac); ++#endif + + /* Callback will set the total samples and sample rate */ ++#if NEED_EASYFLAC + EasyFLAC__process_until_end_of_metadata(flac->decoder); ++#else ++ FLAC__stream_decoder_process_until_end_of_metadata(flac->decoder); ++#endif + + /* Callback will set the number of channels and resize the + audio buffer */ ++#if NEED_EASYFLAC + EasyFLAC__process_single(flac->decoder); +- ++#else ++ FLAC__stream_decoder_process_single(flac->decoder); ++#endif ++ + /* Copy format info for caller */ + opt->rate = flac->rate; + opt->channels = flac->channels; +@@ -133,11 +162,19 @@ + } + else if (!flac->eos) + { ++#if NEED_EASYFLAC + ret = EasyFLAC__process_single(flac->decoder); + if (!ret || + EasyFLAC__get_state(flac->decoder) + == FLAC__STREAM_DECODER_END_OF_STREAM) + flac->eos = 1; /* Bail out! */ ++#else ++ ret = FLAC__stream_decoder_process_single(flac->decoder); ++ if (!ret || ++ FLAC__stream_decoder_get_state(flac->decoder) ++ == FLAC__STREAM_DECODER_END_OF_STREAM) ++ flac->eos = 1; /* Bail out! */ ++#endif + } else + break; + } +@@ -157,13 +194,22 @@ + free(flac->buf); + free(flac->oldbuf); + free(flac->comments); ++#if NEED_EASYFLAC + EasyFLAC__finish(flac->decoder); + EasyFLAC__stream_decoder_delete(flac->decoder); ++#else ++ FLAC__stream_decoder_finish(flac->decoder); ++ FLAC__stream_decoder_delete(flac->decoder); ++#endif + free(flac); + } + + ++#if NEED_EASYFLAC + FLAC__StreamDecoderReadStatus easyflac_read_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) ++#else ++FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + int i = 0; +@@ -200,7 +246,11 @@ + return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; + } + ++#if NEED_EASYFLAC + FLAC__StreamDecoderWriteStatus easyflac_write_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#else ++FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + int samples = frame->header.blocksize; +@@ -221,7 +271,11 @@ + return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; + } + ++#if NEED_EASYFLAC + void easyflac_metadata_callback(const EasyFLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#else ++void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data) ++#endif + { + flacfile *flac = (flacfile *) client_data; + +@@ -240,11 +294,24 @@ + } + } + ++#if NEED_EASYFLAC + void easyflac_error_callback(const EasyFLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#else ++void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ++#endif + { +- flacfile *flac = (flacfile *) client_data; ++ flacfile *flac = (flacfile *) client_data; ++ ++} ++ ++#if !NEED_EASYFLAC ++FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data) ++{ ++ flacfile *flac = (flacfile *) client_data; + ++ return feof(flac->in)? true : false; + } ++#endif + + + void resize_buffer(flacfile *flac, int newchannels, int newsamples) +--- vorbis-tools-1.1.1.orig/oggenc/easyflac.c 2005-06-03 11:15:10.000000000 +0100 ++++ vorbis-tools-1.1.1/oggenc/easyflac.c 2007-04-07 17:25:56.000000000 +0100 +@@ -33,6 +33,9 @@ + * + */ + ++#include <FLAC/export.h> ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++ + #include <stdlib.h> + #include "easyflac.h" + +@@ -373,3 +376,5 @@ + else + return FLAC__stream_decoder_process_until_end_of_stream(decoder->flac); + } ++ ++#endif +--- vorbis-tools-1.1.1.orig/oggenc/flac.h 2005-06-03 11:15:10.000000000 +0100 ++++ vorbis-tools-1.1.1/oggenc/flac.h 2007-04-07 17:31:53.000000000 +0100 +@@ -5,10 +5,21 @@ + #include "encode.h" + #include "audio.h" + #include <stdio.h> ++#include <FLAC/stream_decoder.h> ++#if !defined(FLAC_API_VERSION_CURRENT) || (FLAC_API_VERSION_CURRENT < 8) ++#define NEED_EASYFLAC 1 ++#endif ++#if NEED_EASYFLAC ++#include <OggFLAC/stream_decoder.h> + #include "easyflac.h" ++#endif + + typedef struct { ++#if NEED_EASYFLAC + EasyFLAC__StreamDecoder *decoder; ++#else ++ FLAC__StreamDecoder *decoder; ++#endif + short channels; + int rate; + long totalsamples; /* per channel, of course */

1 0