# ChangeLog for media-sound/gnusound
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.15 2007/02/03 23:06:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.16 2007/02/24 13:10:43 aballier Exp $
+
+ 24 Feb 2007; Alexis Ballier <aballier@gentoo.org>
+ -files/gnusound-0.7.4-amd64.patch, -files/gnusound-0.7.4-automagic.patch,
+ -files/gnusound-0.7.4-destdir.patch, -files/gnusound-0.7.4-ffmpeg.patch,
+ -files/gnusound-0.7.4-ffmpeg-struct.patch,
+ -files/gnusound-0.7.4-flac-1.1.3.patch, gnusound-0.7.4.ebuild:
+ Make a patchset tarball
03 Feb 2007; Alexis Ballier <aballier@gentoo.org> gnusound-0.7.4.ebuild:
Fix multiple inherit calls, thanks to dirtyepic for reporting
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX gnusound-0.7.4-amd64.patch 2130 RMD160 b352e63facf04482dcb4ed8e0d036266ba5f3454 SHA1 6c3442b1ff2c4fd320c282a54939bde4bb1913e4 SHA256 28e95dbbfea1c4d38e9bfc851d82de66ee6bd5f07340f4ae5b468f175bf38d6c
-MD5 e9fe6025935cd601fe42dcc67257d575 files/gnusound-0.7.4-amd64.patch 2130
-RMD160 b352e63facf04482dcb4ed8e0d036266ba5f3454 files/gnusound-0.7.4-amd64.patch 2130
-SHA256 28e95dbbfea1c4d38e9bfc851d82de66ee6bd5f07340f4ae5b468f175bf38d6c files/gnusound-0.7.4-amd64.patch 2130
-AUX gnusound-0.7.4-automagic.patch 5428 RMD160 a227a0c588ef70057cefda2253f52cbe7f9bff11 SHA1 ae4865a1c3fb18a57e7e4dc6d432e8dd99cf5ea3 SHA256 1c95e60c9b44968623b67b339fe1589e11b030942cb5fa58636498b9f231c0e1
-MD5 538a6bdf67001cd850a8adeb315b21ac files/gnusound-0.7.4-automagic.patch 5428
-RMD160 a227a0c588ef70057cefda2253f52cbe7f9bff11 files/gnusound-0.7.4-automagic.patch 5428
-SHA256 1c95e60c9b44968623b67b339fe1589e11b030942cb5fa58636498b9f231c0e1 files/gnusound-0.7.4-automagic.patch 5428
-AUX gnusound-0.7.4-destdir.patch 2718 RMD160 224bea0dc41ca8dba6d4b8efe4fe107a58347e51 SHA1 ebed73b34c2f1d25d10e8e8692a243d9c2074c1c SHA256 dd659406ddaeada3b462dca834ca4825d91d0504cab804f5b0738f1f084b1db8
-MD5 e8e5038471e56408a783b30d279d2d18 files/gnusound-0.7.4-destdir.patch 2718
-RMD160 224bea0dc41ca8dba6d4b8efe4fe107a58347e51 files/gnusound-0.7.4-destdir.patch 2718
-SHA256 dd659406ddaeada3b462dca834ca4825d91d0504cab804f5b0738f1f084b1db8 files/gnusound-0.7.4-destdir.patch 2718
-AUX gnusound-0.7.4-ffmpeg-struct.patch 1680 RMD160 38d414fb73d73713a627fbb3ab9c2ec3f58460a9 SHA1 b7f19520dad07453d09ab249b8f7b2b39e09c5c9 SHA256 e0bb91ee9430c8eeb5e503c697ca365d81e20c7f53000f495044b3fd1c2c9035
-MD5 012fc46dd33ab5808d0cdd297d12611e files/gnusound-0.7.4-ffmpeg-struct.patch 1680
-RMD160 38d414fb73d73713a627fbb3ab9c2ec3f58460a9 files/gnusound-0.7.4-ffmpeg-struct.patch 1680
-SHA256 e0bb91ee9430c8eeb5e503c697ca365d81e20c7f53000f495044b3fd1c2c9035 files/gnusound-0.7.4-ffmpeg-struct.patch 1680
-AUX gnusound-0.7.4-ffmpeg.patch 441 RMD160 386809c8ab3e0785245cb9967640ad9e161983af SHA1 2ee40557670eedfb7d753cb46f6dac1acf989413 SHA256 2192577ea85827b72c42025f707a1556dfea0ab1316981fb0315c1dbfb4697b7
-MD5 087b108cbf21ae439d61a4d08404ef48 files/gnusound-0.7.4-ffmpeg.patch 441
-RMD160 386809c8ab3e0785245cb9967640ad9e161983af files/gnusound-0.7.4-ffmpeg.patch 441
-SHA256 2192577ea85827b72c42025f707a1556dfea0ab1316981fb0315c1dbfb4697b7 files/gnusound-0.7.4-ffmpeg.patch 441
-AUX gnusound-0.7.4-flac-1.1.3.patch 11622 RMD160 e157d53337f7840f6d0bd2294535bf0f9648ebd6 SHA1 c091a1217794ccbeee46574d4b3f63728c2bf4c6 SHA256 24472652fc113373e3fb4de780cd81d05026671f5dbdc48d90a6f11cd422a335
-MD5 9f6d1af17f682bfabec6552509f8ce3a files/gnusound-0.7.4-flac-1.1.3.patch 11622
-RMD160 e157d53337f7840f6d0bd2294535bf0f9648ebd6 files/gnusound-0.7.4-flac-1.1.3.patch 11622
-SHA256 24472652fc113373e3fb4de780cd81d05026671f5dbdc48d90a6f11cd422a335 files/gnusound-0.7.4-flac-1.1.3.patch 11622
+DIST gnusound-0.7.4-patches-1.tar.bz2 6190 RMD160 55b05431c1c0222e1ed73ffcad6c5ad575be163f SHA1 01340a8ecba8a1a5fbcf54eeaebde44ee2fd2c1b SHA256 3586478c7c986fb170b9a2fc71e2b5051bf593625bf0ce079397b306b7ef0040
DIST gnusound-0.7.4.tar.bz2 513044 RMD160 775c7d3ae5dc94f56221526c7e1f0e9afb6a0b7f SHA1 c5fc8bc979d5031ab8850cbd39a072abe7372194 SHA256 9309d8212cf1d98ab1e8de776e52e2fcd6e68618b0bf4ac60766f6351746edfb
-EBUILD gnusound-0.7.4.ebuild 2493 RMD160 df528ed9edda4831079a1c2f98c0330798f6e232 SHA1 51a504b7f0576f479d63eaaec85df56a930684f4 SHA256 3e3d56da22fc815bd47bb6c5735a135db7444bd1e887f8de74eebd7dc0e3ee10
-MD5 724ec9949084da8cafd5f48745d3c14d gnusound-0.7.4.ebuild 2493
-RMD160 df528ed9edda4831079a1c2f98c0330798f6e232 gnusound-0.7.4.ebuild 2493
-SHA256 3e3d56da22fc815bd47bb6c5735a135db7444bd1e887f8de74eebd7dc0e3ee10 gnusound-0.7.4.ebuild 2493
-MISC ChangeLog 2753 RMD160 af3fef6b986908c01006389aae456de3ea5d17e1 SHA1 1688a3cd3fe3c11a06dad0142ab6723acfb59b63 SHA256 150ce1c78a0949f0c21cff1f3a2f480022caf00d6ee0c340bbf7659dcdf458ed
-MD5 332b6787243fd70801a45a1d8f6f66ed ChangeLog 2753
-RMD160 af3fef6b986908c01006389aae456de3ea5d17e1 ChangeLog 2753
-SHA256 150ce1c78a0949f0c21cff1f3a2f480022caf00d6ee0c340bbf7659dcdf458ed ChangeLog 2753
+EBUILD gnusound-0.7.4.ebuild 2184 RMD160 9be7578bb25c0217df67f536dc7849fb782f3402 SHA1 0323abb4ffb9d915ea887efa8d82517592bca447 SHA256 59d1e9091b134ec99fc79c165145432f4d125347e4c3e17a46121c40a153bf41
+MD5 4f95add446b1c45770878bd557430ad9 gnusound-0.7.4.ebuild 2184
+RMD160 9be7578bb25c0217df67f536dc7849fb782f3402 gnusound-0.7.4.ebuild 2184
+SHA256 59d1e9091b134ec99fc79c165145432f4d125347e4c3e17a46121c40a153bf41 gnusound-0.7.4.ebuild 2184
+MISC ChangeLog 3093 RMD160 b5d467d65b370bc50c51253ea6a1da1f08740ec7 SHA1 784f732ee8bd1a29c8e70d53e2100001e643bd5a SHA256 2d436dc1eb6749225b2572da96ad076f5db101e1f158ff13a8e7e219f6fd69a4
+MD5 289eaa22801ab6ded3fdfca5f893d832 ChangeLog 3093
+RMD160 b5d467d65b370bc50c51253ea6a1da1f08740ec7 ChangeLog 3093
+SHA256 2d436dc1eb6749225b2572da96ad076f5db101e1f158ff13a8e7e219f6fd69a4 ChangeLog 3093
MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 c85d487477798897e43b6acdddf7041c files/digest-gnusound-0.7.4 247
-RMD160 ff3404278ceac1b154292da474fc2aebaf859375 files/digest-gnusound-0.7.4 247
-SHA256 3961ff2a880a87ee5b2dad63c7e96a4d2fcaf07cdea6bc7487b88159e8aa10ea files/digest-gnusound-0.7.4 247
+MD5 b5f3aa8094a9fb4d943de0fcb0e348ce files/digest-gnusound-0.7.4 518
+RMD160 ff3a81ca6f33beb7a8b8f0a03d40cd6e19f4784d files/digest-gnusound-0.7.4 518
+SHA256 e5416ad11b57713eee394692ea50c38279397aeefdf7b5b61810409597906f71 files/digest-gnusound-0.7.4 518
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.2 (GNU/Linux)
-iD8DBQFFxRV4vFcC4BYPU0oRAnNWAJ4iVpqnHynDY4VyW0eypImyL19liQCdG4CG
-EwzxFRRgH83KmyALZOIL4hA=
-=GFn7
+iD8DBQFF4DlZvFcC4BYPU0oRAoqUAKCzpBvGwd+bTxKgSq8YA6QSu2FKawCfTfEk
+YUn9BUp1XKDwcstXo8mAPBo=
+=KYW/
-----END PGP SIGNATURE-----
+MD5 ba1af034433f1a09db475a77cdf4e35c gnusound-0.7.4-patches-1.tar.bz2 6190
+RMD160 55b05431c1c0222e1ed73ffcad6c5ad575be163f gnusound-0.7.4-patches-1.tar.bz2 6190
+SHA256 3586478c7c986fb170b9a2fc71e2b5051bf593625bf0ce079397b306b7ef0040 gnusound-0.7.4-patches-1.tar.bz2 6190
MD5 4b523f60bbdebdcaa9e88f3d818f2eb4 gnusound-0.7.4.tar.bz2 513044
RMD160 775c7d3ae5dc94f56221526c7e1f0e9afb6a0b7f gnusound-0.7.4.tar.bz2 513044
SHA256 9309d8212cf1d98ab1e8de776e52e2fcd6e68618b0bf4ac60766f6351746edfb gnusound-0.7.4.tar.bz2 513044
+++ /dev/null
-Index: configure.ac
-===================================================================
---- configure.ac
-+++ configure.ac 2006-07-26 23:26:38.637089048 +0200
-@@ -36,7 +36,7 @@
- dnl System type
- AC_CANONICAL_HOST
- case $host_cpu in
--i686|x86|x86_64|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*)
-+i686|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*)
- AC_DEFINE(HAVE_ARCH_X86,,[Whether this computer has an x86 CPU])
- ;;
- esac
-Index: src/defines.h
-===================================================================
---- src/defines.h
-+++ src/defines.h 2006-07-26 23:27:48.781503880 +0200
-@@ -24,7 +24,7 @@
- /* #undef SIZEOF_SIZE_T */
-
- /* Whether this computer has an x86 CPU */
--#define HAVE_ARCH_X86
-+/* #undef HAVE_ARCH_X86 */
-
- /* The number of CPUs in this machine */
- /* #undef CPU_COUNT */
-Index: src/sample.c
-===================================================================
---- src/sample.c
-+++ src/sample.c 2006-07-26 23:32:15.611081901 +0200
-@@ -616,6 +616,7 @@
-
- cpu_caps = arbiter_get_cpu_caps();
-
-+#ifdef HAVE_ARCH_X86
- #if USE_MMX_MINMAX == 3
- DEBUG("using static 3DNow! minmax\n");
- #elif USE_MMX_MINMAX == 2
-@@ -641,6 +642,9 @@
- #else
- DEBUG("Using plain C minmax\n");
- #endif /* USE_MMX_MINMAX */
-+#else
-+ DEBUG("Using plain C minmax\n");
-+#endif
-
- return 0;
- }
-Index: src/sample.h
-===================================================================
---- src/sample.h
-+++ src/sample.h 2006-07-26 23:34:42.999953554 +0200
-@@ -25,6 +25,7 @@
- #include <config.h>
- #include <audiofile.h>
-
-+#ifdef HAVE_ARCH_X86
- #if USE_MMX_MINMAX == 2
- #define PEAK_MIN_FUNC min_int8_mmx2
- #define PEAK_MAX_FUNC max_int8_mmx2
-@@ -47,6 +48,14 @@
- #define MIN16_FUNC peak_funcs.min16_func
- #define MAX16_FUNC peak_funcs.max16_func
- #endif
-+#else
-+#define PEAK_MIN_FUNC peak_funcs.peak_min_func
-+#define PEAK_MAX_FUNC peak_funcs.peak_max_func
-+#define MIN8_FUNC peak_funcs.min8_func
-+#define MAX8_FUNC peak_funcs.max8_func
-+#define MIN16_FUNC peak_funcs.min16_func
-+#define MAX16_FUNC peak_funcs.max16_func
-+#endif
-
- struct peak_func_table {
- graph_bits_unit_t (*peak_min_func)(const peak_unit_t *a, int count);
+++ /dev/null
---- gnusound-0.7.4/configure.ac.old 2006-11-29 19:04:34.000000000 +0100
-+++ gnusound-0.7.4/configure.ac 2006-11-29 19:05:05.000000000 +0100
-@@ -97,6 +97,10 @@
-
- file_drivers=
- dnl Audiofile
-+AC_ARG_ENABLE(audiofile, AC_HELP_STRING([--disable-audiofile], [disable support for firewire (default=autodetect)]), [ enable_audiofile=$enableval ], [ enable_audiofile=yes ])
-+
-+if test "x$enable_audiofile" = "xyes"; then
-+
- if test -z "$AUDIOFILE_CONFIG"; then
- AC_PATH_PROG(AUDIOFILE_CONFIG, audiofile-config, no,
- [$PATH:/usr/local/bin:/opt/bin])
-@@ -115,37 +119,57 @@
- file_drivers="audiofile"
- fi
-
-+fi
-+
- dnl LAME
-+AC_ARG_ENABLE(lame, AC_HELP_STRING([--disable-lame], [disable support for lame (default=autodetect)]), [ enable_lame=$enableval ], [ enable_lame=yes ])
-+
-+if test "x$enable_lame" = "xyes"; then
- AC_CHECK_HEADER([lame/lame.h],
- [AC_CHECK_LIB([mp3lame], [lame_init],
- [AC_DEFINE(HAVE_LAME)
- echo "-lmp3lame -lm" > ${module_path}/.file_lame.cflags
- file_drivers="lame $file_drivers"],
- [echo > ${module_path}/.file_lame.cflags], [-lm])])
--
-+fi
- dnl sndfile
-+AC_ARG_ENABLE(sndfile, AC_HELP_STRING([--disable-sndfile], [disable support for sndfile (default=autodetect)]), [ enable_sndfile=$enableval ], [ enable_sndfile=yes ])
-+
-+if test "x$enable_sndfile" = "xyes"; then
- PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.4,
- AC_DEFINE(HAVE_SNDFILE)
- file_drivers="sndfile $file_drivers"
- echo "$SNDFILE_CFLAGS $SNDFILE_LIBS" > ${module_path}/.file_sndfile.cflags,
- echo > ${module_path}/.file_sndfile.cflags
- echo "no")
-+fi
-
- dnl gmerlin_avdecoder
-+AC_ARG_ENABLE(gmerlin, AC_HELP_STRING([--disable-gmerlin], [disable support for gmerlin (default=autodetect)]), [ enable_gmerlin=$enableval ], [ enable_gmerlin=yes ])
-+
-+if test "x$enable_gmerlin" = "xyes"; then
- PKG_CHECK_MODULES(GMERLIN_AVDEC, gmerlin_avdec = 0.1.2,
- AC_DEFINE(HAVE_GMERLIN_AVDEC)
- file_drivers="gmerlin_avdec $file_drivers"
- echo "$GMERLIN_AVDEC_CFLAGS $GMERLIN_AVDEC_LIBS" > ${module_path}/.file_gmerlin_avdec.cflags,
- echo > ${module_path}/.file_gmerlin_avdec.cflags
- echo "no")
-+fi
-
-
- dnl OGG
-+AC_ARG_ENABLE(ogg, AC_HELP_STRING([--disable-ogg], [disable support for ogg (default=autodetect)]), [ enable_ogg=$enableval ], [ enable_ogg=yes ])
-+
-+if test "x$enable_ogg" = "xyes"; then
- AC_CHECK_LIB([ogg], [ogg_stream_init],
- [AC_DEFINE(HAVE_OGG)
- use="$use -logg"], [], [])
-+fi
-
- dnl Vorbis
-+AC_ARG_ENABLE(vorbis, AC_HELP_STRING([--disable-vorbis], [disable support for vorbis (default=autodetect)]), [ enable_vorbis=$enableval ], [ enable_vorbis=yes ])
-+
-+if test "x$enable_vorbis" = "xyes"; then
- AC_CHECK_LIB([vorbis], [vorbis_info_init],
- [AC_DEFINE(HAVE_VORBIS)
- use="$use -lvorbis"], [], [])
-@@ -154,26 +178,35 @@
- AC_CHECK_LIB([vorbisenc], [vorbis_encode_init],
- [AC_DEFINE(HAVE_VORBIS)
- use="$use -lvorbisenc"], [], [])
-+fi
-
- dnl FFMPEG
-+AC_ARG_ENABLE(ffmpeg, AC_HELP_STRING([--disable-ffmpeg], [disable support for ffmpeg (default=autodetect)]), [ enable_ffmpeg=$enableval ], [ enable_ffmpeg=yes ])
-+
-+if test "x$enable_ffmpeg" = "xyes"; then
- AC_CHECK_HEADER([ffmpeg/avformat.h],
- [AC_CHECK_LIB([avformat], [av_open_input_file],
- [AC_DEFINE(HAVE_FFMPEG)
- echo "-lavformat -lavcodec -lm $use" > ${module_path}/.file_ffmpeg.cflags
- file_drivers="ffmpeg $file_drivers"],
- [echo > ${module_path}/.file_ffmpeg.cflags], [-lavcodec -lm])])
-+fi
-
- if test "x${file_drivers}" = "x"; then
- AC_MSG_ERROR([*** no suitable file drivers found ***])
- fi
-
- dnl FLAC
-+AC_ARG_ENABLE(flac, AC_HELP_STRING([--disable-flac], [disable support for flac (default=autodetect)]), [ enable_flac=$enableval ], [ enable_flac=yes ])
-+
-+if test "x$enable_flac" = "xyes"; then
- AC_CHECK_HEADER([FLAC/format.h],
- [AC_CHECK_LIB([FLAC], [FLAC__file_decoder_new],
- [AC_DEFINE(HAVE_FLAC)
- echo "-lFLAC -lm" > ${module_path}/.file_flac.cflags
- file_drivers="flac $file_drivers"],
- [echo > ${module_path}/.file_flac.cflags], [-lm])])
-+fi
-
- if test "x${file_drivers}" = "x"; then
- AC_MSG_ERROR([*** no suitable file drivers found ***])
-@@ -185,11 +218,18 @@
-
- audio_drivers=
- dnl OSS
-+AC_ARG_ENABLE(oss, AC_HELP_STRING([--disable-oss], [disable support for oss (default=autodetect)]), [ enable_oss=$enableval ], [ enable_oss=yes ])
-+
-+if test "x$enable_oss" = "xyes"; then
- AC_CHECK_HEADER(sys/soundcard.h,
- audio_drivers="oss"
- AC_DEFINE(HAVE_OSS),)
-+fi
-
- dnl ALSA
-+AC_ARG_ENABLE(alsa, AC_HELP_STRING([--disable-alsa], [disable support for alsa (default=autodetect)]), [ enable_alsa=$enableval ], [ enable_alsa=yes ])
-+
-+if test "x$enable_alsa" = "xyes"; then
- LIBS_BACKUP=$LIBS
- AM_PATH_ALSA(1.0.2,
- AC_DEFINE(HAVE_ALSA)
-@@ -198,14 +238,19 @@
- [echo > ${module_path}/.player_alsa.cflags
- echo "no"])
- LIBS=$LIBS_BACKUP
-+fi
-
- dnl JACK
-+AC_ARG_ENABLE(jack, AC_HELP_STRING([--disable-jack], [disable support for jack (default=autodetect)]), [ enable_jack=$enableval ], [ enable_jack=yes ])
-+
-+if test "x$enable_jack" = "xyes"; then
- PKG_CHECK_MODULES(JACK,jack >= 0.9.4,
- AC_DEFINE(HAVE_JACK)
- audio_drivers="$audio_drivers jack"
- echo "$JACK_CFLAGS $JACK_LIBS" > ${module_path}/.player_jack.cflags,
- [echo > ${module_path}/.player_jack.cflags
- echo "no"])
-+fi
-
- if test "x${audio_drivers}" = "x"; then
- AC_MSG_ERROR([*** no suitable audio drivers found, install OSS (www.4front-tech.com) or ALSA (www.alsa-project.org) ***])
+++ /dev/null
-diff -uprN gnusound-0.7.4/doc/Makefile.in gnusound/doc/Makefile.in
---- gnusound-0.7.4/doc/Makefile.in 2005-06-19 19:44:22.000000000 +0400
-+++ gnusound/doc/Makefile.in 2005-07-28 20:14:07.122610024 +0400
-@@ -50,15 +50,15 @@ uninstall:
- rm -rf $(datadir)
-
- install:
-- mkdir -p $(omfdir)
-+ mkdir -p $(DESTDIR)$(omfdir)
- for lang in $(LANGUAGES); do \
-- mkdir -p $(datadir)/$$lang; \
-+ mkdir -p $(DESTDIR)$(datadir)/$$lang; \
- install -m 644 -o $(owner_user) -g $(owner_group) \
- $$lang/*.xml $$lang/*.html $$lang/topic.dat \
-- $(datadir)/$$lang; \
-+ $(DESTDIR)$(datadir)/$$lang; \
- install -m 644 -o $(owner_user) -g $(owner_group) \
- $$lang/$(name).omf \
-- $(omfdir)/$(name)-$$lang.omf; \
-+ $(DESTDIR)$(omfdir)/$(name)-$$lang.omf; \
- done
-
- .PHONY: dist clean veryclean distclean install uninstall
-diff -uprN gnusound-0.7.4/Makefile.in gnusound/Makefile.in
---- gnusound-0.7.4/Makefile.in 2005-06-19 19:44:29.000000000 +0400
-+++ gnusound/Makefile.in 2005-07-28 20:11:22.391652936 +0400
-@@ -194,12 +194,12 @@ src/$(name): $(objects) .ldflags
- install: all
- $(MAKE) -C doc install owner_user=$(owner_user) owner_group=$(owner_group)
- $(MAKE) -C modules install owner_user=$(owner_user) owner_group=$(owner_group)
-- mkdir -p $(bindir)
-- mkdir -p $(guidir)
-- mkdir -p $(desktopdir)
-- install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) $(bindir)
-- install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) $(guidir)
-- install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) $(desktopdir)
-+ mkdir -p $(DESTDIR)$(bindir)
-+ mkdir -p $(DESTDIR)$(guidir)
-+ mkdir -p $(DESTDIR)$(desktopdir)
-+ install -m 755 -o $(owner_user) -g $(owner_group) src/$(name) $(DESTDIR)$(bindir)
-+ install -m 644 -o $(owner_user) -g $(owner_group) $(gui_files) $(DESTDIR)$(guidir)
-+ install -m 644 -o $(owner_user) -g $(owner_group) $(desktop_files) $(DESTDIR)$(desktopdir)
-
- uninstall:
- $(MAKE) -C modules uninstall
-diff -uprN gnusound-0.7.4/modules/Makefile.in gnusound/modules/Makefile.in
---- gnusound-0.7.4/modules/Makefile.in 2005-06-19 19:44:26.000000000 +0400
-+++ gnusound/modules/Makefile.in 2005-07-28 20:14:53.690530624 +0400
-@@ -60,8 +60,8 @@ $(gnusounddir)/.cflags:
- $(CC) `cat $(gnusounddir)/.cflags` -I$(gnusounddir)/src -I$(gnusounddir)/src/$(gtk) -fPIC -shared $< -o $@ `cat .$(basename $@).cflags`
-
- install:
-- mkdir -p $(moduledir)
-- install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) $(moduledir)
-+ mkdir -p $(DESTDIR)$(moduledir)
-+ install -m 644 -o $(owner_user) -g $(owner_group) $(module_files) $(DESTDIR)$(moduledir)
-
- uninstall:
- (cd $(moduledir) && rm -f $(module_files))
+++ /dev/null
-Index: modules/file_ffmpeg.c
-===================================================================
---- modules/file_ffmpeg.c
-+++ modules/file_ffmpeg.c 2006-07-26 23:50:11.721445982 +0200
-@@ -146,7 +146,7 @@
- return cmd_new_error_val("Could not open audio stream");
- }
-
-- codec = avcodec_find_decoder(fc->streams[audio_index]->codec.codec_id);
-+ codec = avcodec_find_decoder(fc->streams[audio_index]->codec->codec_id);
- snprintf(ffmpeg_data->format_name, sizeof(ffmpeg_data->format_name),
- "%s/%s", fc->iformat->name, codec->name);
-
-@@ -155,8 +155,8 @@
- ffmpeg_data->audio_stream = fc->streams[audio_index];
-
- params->sample_type = SAMPLE_TYPE_INT_16;
-- params->sample_rate = ffmpeg_data->audio_stream->codec.sample_rate;
-- params->channels = ffmpeg_data->audio_stream->codec.channels;
-+ params->sample_rate = ffmpeg_data->audio_stream->codec->sample_rate;
-+ params->channels = ffmpeg_data->audio_stream->codec->channels;
- params->frame_count = -1;
-
- av_read_play(fc);
-@@ -274,14 +274,14 @@
- * could save a memcpy() here, but this is cleaner.
- */
-
-- copied = MIN(count * ffmpeg_data->audio_stream->codec.channels * 2,
-+ copied = MIN(count * ffmpeg_data->audio_stream->codec->channels * 2,
- ffmpeg_data->decode_buf_avail);
- memcpy(buf, ffmpeg_data->decode_buf + ffmpeg_data->decode_buf_offset,
- copied);
- ffmpeg_data->decode_buf_offset += copied;
- ffmpeg_data->decode_buf_avail -= copied;
-
-- return copied / (ffmpeg_data->audio_stream->codec.channels * 2);
-+ return copied / (ffmpeg_data->audio_stream->codec->channels * 2);
- }
-
- static long
+++ /dev/null
---- gnusound-0.7.4/modules/file_ffmpeg.c.old 2007-01-30 11:59:43.000000000 +0100
-+++ gnusound-0.7.4/modules/file_ffmpeg.c 2007-01-30 11:59:51.000000000 +0100
-@@ -99,7 +99,6 @@
- int err, i, audio_index = -1;
-
- memset(&format_params, 0, sizeof(format_params));
-- format_params.image_format = NULL;
- format_params.initial_pause = 1; /* we force a pause when starting an RTSP
- stream */
-
+++ /dev/null
---- gnusound-0.7.4/configure.ac.old 2006-12-01 09:22:39.000000000 +0100
-+++ gnusound-0.7.4/configure.ac 2006-12-01 09:22:44.000000000 +0100
-@@ -200,12 +200,26 @@
- AC_ARG_ENABLE(flac, AC_HELP_STRING([--disable-flac], [disable support for flac (default=autodetect)]), [ enable_flac=$enableval ], [ enable_flac=yes ])
-
- if test "x$enable_flac" = "xyes"; then
-+AC_TRY_RUN([
-+#include <FLAC/export.h>
-+int main () { return FLAC_API_VERSION_CURRENT<8; }
-+],legacy_flac=no,legacy_flac=yes,legacy_flac=no)
-+
-+if test "x$legacy_flac" = xyes; then
- AC_CHECK_HEADER([FLAC/format.h],
- [AC_CHECK_LIB([FLAC], [FLAC__file_decoder_new],
- [AC_DEFINE(HAVE_FLAC)
- echo "-lFLAC -lm" > ${module_path}/.file_flac.cflags
- file_drivers="flac $file_drivers"],
- [echo > ${module_path}/.file_flac.cflags], [-lm])])
-+else
-+AC_CHECK_HEADER([FLAC/format.h],
-+ [AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_new],
-+ [AC_DEFINE(HAVE_FLAC)
-+ echo "-lFLAC -lm" > ${module_path}/.file_flac.cflags
-+ file_drivers="flac $file_drivers"],
-+ [echo > ${module_path}/.file_flac.cflags], [-lm])])
-+fi
- fi
-
- if test "x${file_drivers}" = "x"; then
---- gnusound-0.7.4/modules/file_flac.c.old 2006-12-01 09:22:42.000000000 +0100
-+++ gnusound-0.7.4/modules/file_flac.c 2006-12-01 09:23:20.000000000 +0100
-@@ -32,11 +32,22 @@
-
- #include <FLAC/all.h>
-
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+
- struct flac_data {
-
- /* Decoder support. */
-
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoder *decoder;
-+#else
-+ FLAC__StreamDecoder *decoder;
-+#endif
-
- int dec_inited;
- int dec_error;
-@@ -51,7 +62,11 @@
-
- /* Encoder support */
-
-+#ifdef LEGACY_FLAC
- FLAC__FileEncoder *encoder;
-+#else
-+ FLAC__StreamEncoder *encoder;
-+#endif
-
- int enc_inited;
- int enc_error;
-@@ -95,11 +110,19 @@
- } \
- }
-
-+#ifdef LEGACY_FLAC
- static FLAC__StreamDecoderWriteStatus
- flac_dec_write_callback(const FLAC__FileDecoder *decoder,
- const FLAC__Frame *frame,
- const FLAC__int32 * const buffer[],
- void *client_data) {
-+#else
-+static FLAC__StreamDecoderWriteStatus
-+flac_dec_write_callback(const FLAC__StreamDecoder *decoder,
-+ const FLAC__Frame *frame,
-+ const FLAC__int32 * const buffer[],
-+ void *client_data) {
-+#endif
- struct flac_data *flac_data = ((struct file *)client_data)->driver_data;
- int i, j, count, channels;
- void *dst;
-@@ -131,8 +154,13 @@
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
-
-+#ifdef LEGACY_FLAC
- static void
- flac_dec_metadata_callback(const FLAC__FileDecoder *decoder,
-+#else
-+static void
-+flac_dec_metadata_callback(const FLAC__StreamDecoder *decoder,
-+#endif
- const FLAC__StreamMetadata *metadata,
- void *client_data) {
- struct flac_data *flac_data = ((struct file *)client_data)->driver_data;
-@@ -173,10 +201,17 @@
- }
- }
-
-+#ifdef LEGACY_FLAC
- static void
- flac_dec_error_callback(const FLAC__FileDecoder *decoder,
- FLAC__StreamDecoderErrorStatus status,
- void *client_data) {
-+#else
-+static void
-+flac_dec_error_callback(const FLAC__StreamDecoder *decoder,
-+ FLAC__StreamDecoderErrorStatus status,
-+ void *client_data) {
-+#endif
- struct flac_data *flac_data = ((struct file *)client_data)->driver_data;
-
- flac_data->dec_error = 1;
-@@ -186,8 +221,8 @@
- flac_open_for_reading(struct file *file,
- struct file_params *params) {
- struct flac_data *flac_data = file->driver_data;
-+#ifdef LEGACY_FLAC
- FLAC__FileDecoder *decoder;
--
- decoder = FLAC__file_decoder_new();
-
- FLAC__file_decoder_set_md5_checking(decoder, false);
-@@ -204,12 +239,31 @@
-
- if(!FLAC__file_decoder_process_until_end_of_metadata(decoder))
- return cmd_new_error_val("Could not process FLAC metadata: %s", FLAC__FileDecoderStateString[FLAC__file_decoder_get_state(decoder)]);
--
-+#else
-+ FLAC__StreamDecoder *decoder;
-+ decoder = FLAC__stream_decoder_new();
-+
-+ FLAC__stream_decoder_set_md5_checking(decoder, true);
-+ FLAC__stream_decoder_set_metadata_ignore_all(decoder);
-+ FLAC__stream_decoder_set_metadata_respond(decoder, FLAC__METADATA_TYPE_STREAMINFO);
-+ FLAC__stream_decoder_set_metadata_respond(decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+
-+ if(FLAC__stream_decoder_init_file(decoder, file->name, flac_dec_write_callback, flac_dec_metadata_callback, flac_dec_error_callback, file) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+ return cmd_new_error_val("Could not initialize FLAC decoder: %s", FLAC__StreamDecoderStateString[FLAC__stream_decoder_get_state(decoder)]);
-+
-+ if(!FLAC__stream_decoder_process_until_end_of_metadata(decoder))
-+ return cmd_new_error_val("Could not process FLAC metadata: %s", FLAC__StreamDecoderStateString[FLAC__stream_decoder_get_state(decoder)]);
-+#endif
- flac_data->decoder = decoder;
-
- if(!flac_data->dec_inited || flac_data->dec_error) {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_finish(decoder);
- FLAC__file_decoder_delete(decoder);
-+#else
-+ FLAC__stream_decoder_finish(decoder);
-+ FLAC__stream_decoder_delete(decoder);
-+#endif
- return cmd_new_error_val("Could not find STREAM info or "
- "STREAM info was invalid");
- }
-@@ -217,8 +271,13 @@
- /* This is highly unlikely. */
-
- if(flac_data->dec_max_blocksize > SAVE_BUF_SIZE) {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_finish(decoder);
- FLAC__file_decoder_delete(decoder);
-+#else
-+ FLAC__stream_decoder_finish(decoder);
-+ FLAC__stream_decoder_delete(decoder);
-+#endif
- return cmd_new_error_val("The maximum blocksize (%d) for this file "
- "is larger than SAVE_BUF_SIZE (%d), increase "
- "SAVE_BUF_SIZE and recompile",
-@@ -239,7 +298,11 @@
- struct flac_data *flac_data = file->driver_data;
- struct cmd_value *r;
- int err, bits_per_sample;
-+#ifdef LEGACY_FLAC
- FLAC__FileEncoder *encoder;
-+#else
-+ FLAC__StreamEncoder *encoder;
-+#endif
- const char *status;
- int max_lpc_order = 0,
- blocksize = 1152,
-@@ -258,13 +321,22 @@
- if(!flac_data->enc_buffer)
- return cmd_new_error_val("Could not allocate encoder buffer");
-
-+#ifdef LEGACY_FLAC
- encoder = FLAC__file_encoder_new();
-+#else
-+ encoder = FLAC__stream_encoder_new();
-+#endif
-
- /* Standard properties. */
-
-+#ifdef LEGACY_FLAC
- FLAC__file_encoder_set_filename(encoder, file->name);
- FLAC__file_encoder_set_channels(encoder, params->channels);
- FLAC__file_encoder_set_sample_rate(encoder, params->sample_rate);
-+#else
-+ FLAC__stream_encoder_set_channels(encoder, params->channels);
-+ FLAC__stream_encoder_set_sample_rate(encoder, params->sample_rate);
-+#endif
- switch(params->sample_type) {
- case SAMPLE_TYPE_INT_8:
- bits_per_sample = 8;
-@@ -281,7 +353,11 @@
- bits_per_sample = 24;
- break;
- }
-+#ifdef LEGACY_FLAC
- FLAC__file_encoder_set_bits_per_sample(encoder, bits_per_sample);
-+#else
-+ FLAC__stream_encoder_set_bits_per_sample(encoder, bits_per_sample);
-+#endif
-
- /* FLAC encoding parameters. */
-
-@@ -348,6 +424,7 @@
- break;
- }
-
-+#ifdef LEGACY_FLAC
- FLAC__file_encoder_set_do_exhaustive_model_search(encoder, exhaustive_model_search);
- FLAC__file_encoder_set_blocksize(encoder, blocksize);
- FLAC__file_encoder_set_max_lpc_order(encoder, max_lpc_order);
-@@ -359,7 +436,6 @@
- }
-
- if((err = FLAC__file_encoder_init(encoder)) != FLAC__FILE_ENCODER_OK) {
--
- /* Initialization failed, get error condition. */
-
- if(flac_data->enc_buffer)
-@@ -384,6 +460,39 @@
- return r;
-
- }
-+#else
-+ FLAC__stream_encoder_set_do_exhaustive_model_search(encoder, exhaustive_model_search);
-+ FLAC__stream_encoder_set_blocksize(encoder, blocksize);
-+ FLAC__stream_encoder_set_max_lpc_order(encoder, max_lpc_order);
-+ FLAC__stream_encoder_set_min_residual_partition_order(encoder, residual_partition_order_min);
-+ FLAC__stream_encoder_set_max_residual_partition_order(encoder, residual_partition_order_max);
-+ if(params->channels == 2) {
-+ FLAC__stream_encoder_set_do_mid_side_stereo(encoder, mid_side);
-+ FLAC__stream_encoder_set_loose_mid_side_stereo(encoder, adaptive_mid_side);
-+ }
-+
-+ if((err = FLAC__stream_encoder_init_file(encoder, file->name, NULL, NULL)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+ /* Initialization failed, get error condition. */
-+
-+ if(flac_data->enc_buffer)
-+ mem_free(flac_data->enc_buffer);
-+
-+ if(FLAC__stream_encoder_get_state(encoder) !=
-+ FLAC__STREAM_ENCODER_OK) {
-+ status = FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_state(encoder)];
-+ } else {
-+ status = FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_state(encoder)];
-+ }
-+
-+ FAIL("encoder initialization failure: %s\n", status);
-+ r = cmd_new_error_val("Could not initialize encoder: %s", status);
-+
-+ FLAC__stream_encoder_delete(encoder);
-+
-+ return r;
-+
-+ }
-+#endif
-
- flac_data->encoder = encoder;
- flac_data->enc_sample_type = params->sample_type;
-@@ -419,7 +528,11 @@
- * buffer.
- */
-
-+#ifdef LEGACY_FLAC
- if(!FLAC__file_decoder_process_single(flac_data->decoder))
-+#else
-+ if(!FLAC__stream_decoder_process_single(flac_data->decoder))
-+#endif
- return -1;
-
- if(flac_data->dec_error)
-@@ -463,11 +576,21 @@
- break;
- }
-
-+#ifdef LEGACY_FLAC
- err = FLAC__file_encoder_process_interleaved(flac_data->encoder,
- flac_data->enc_buffer,
- count);
-+#else
-+ err = FLAC__stream_encoder_process_interleaved(flac_data->encoder,
-+ flac_data->enc_buffer,
-+ count);
-+#endif
- if(!err) {
-+#ifdef LEGACY_FLAC
- FAIL("encoder failure: %s\n", FLAC__FileEncoderStateString[FLAC__file_encoder_get_state(flac_data->encoder)]);
-+#else
-+ FAIL("encoder failure: %s\n", FLAC__StreamEncoderStateString[FLAC__stream_encoder_get_state(flac_data->encoder)]);
-+#endif
- return -1;
- }
-
-@@ -479,16 +602,26 @@
- struct flac_data *flac_data = file->driver_data;
-
- if(flac_data->dec_inited) {
-+#ifdef LEGACY_FLAC
- FLAC__file_decoder_finish(flac_data->decoder);
- FLAC__file_decoder_delete(flac_data->decoder);
-+#else
-+ FLAC__stream_decoder_finish(flac_data->decoder);
-+ FLAC__stream_decoder_delete(flac_data->decoder);
-+#endif
- // if(flac_data->dec_buffer)
- // mem_free(flac_data->dec_buffer);
- flac_data->dec_inited = 0;
- }
-
- if(flac_data->enc_inited) {
-+#ifdef LEGACY_FLAC
- FLAC__file_encoder_finish(flac_data->encoder);
- FLAC__file_encoder_delete(flac_data->encoder);
-+#else
-+ FLAC__stream_encoder_finish(flac_data->encoder);
-+ FLAC__stream_encoder_delete(flac_data->encoder);
-+#endif
- if(flac_data->enc_buffer)
- mem_free(flac_data->enc_buffer);
- flac_data->enc_inited = 0;
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.4 2007/02/03 23:06:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.5 2007/02/24 13:10:43 aballier Exp $
WANT_ATUOMAKE=1.8
WANT_AUTOCONF=2.5
IUSE="3dnow alsa audiofile cpudetection flac ffmpeg jack lame libsamplerate mmx
ogg oss sse vorbis"
+PATCHLEVEL="1"
DESCRIPTION="GNUsound is a sound editor for Linux/x86"
HOMEPAGE="http://gnusound.sourceforge.net/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+ mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
}
src_unpack() {
unpack ${A} || die "unpack failure"
- cd ${S} || die "workdir not found"
- rm -f doc/Makefile || die "could not remove doc Makefile"
- rm -f modules/Makefile || die "could not remove modules Makefile"
- sed -i "s:docrootdir:datadir:" doc/Makefile.in
-
- epatch "${FILESDIR}/${P}-destdir.patch"
- epatch "${FILESDIR}/${P}-amd64.patch"
- epatch "${FILESDIR}/${P}-ffmpeg-struct.patch"
- epatch "${FILESDIR}/${P}-automagic.patch"
- epatch "${FILESDIR}/${P}-flac-1.1.3.patch"
- epatch "${FILESDIR}/${P}-ffmpeg.patch"
+ cd "${S}" || die "workdir not found"
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
AT_M4DIR="config" eautoreconf
}
projects / gentoo.git / commitdiff