# ChangeLog for media-sound/gnusound
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.10 2006/06/16 21:21:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.11 2006/11/29 19:23:12 aballier Exp $
+
+*gnusound-0.7.4 (29 Nov 2006)
+
+ 29 Nov 2006; 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-struct.patch, +gnusound-0.7.4.ebuild:
+ Version bump, using gnome2, with patches from mandriva, plus a patch
+ removing automagic dependencies
16 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> gnusound-0.6.2.ebuild,
gnusound-0.7.ebuild:
MD5 81cee6b7a949cef7e03d3a57349701c9 files/gnusound-0.7-destdir.patch 2451
RMD160 54f46f0c924370c65584920866ea05dba503486f files/gnusound-0.7-destdir.patch 2451
SHA256 73e680760bf345df3b46fb2b65ed2ad256a32dd17a049dad2ff3e8defcbe6f8c files/gnusound-0.7-destdir.patch 2451
-DIST gnusound-0.6.2.tar.bz2 256284
-DIST gnusound-0.7.tar.bz2 538950
+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
+DIST gnusound-0.6.2.tar.bz2 256284 RMD160 fbfa0249b6804707d491f5b74abdfceba9834285 SHA1 e82201bf7cd0c570ed6c6c396a623c0f8d3b5008 SHA256 f70cbb3ecf4c81b7c3fec2949d32d47710e9255d4b522fa02811637143fe56bc
+DIST gnusound-0.7.4.tar.bz2 513044 RMD160 775c7d3ae5dc94f56221526c7e1f0e9afb6a0b7f SHA1 c5fc8bc979d5031ab8850cbd39a072abe7372194 SHA256 9309d8212cf1d98ab1e8de776e52e2fcd6e68618b0bf4ac60766f6351746edfb
+DIST gnusound-0.7.tar.bz2 538950 RMD160 4985aa1cf66e75eed7c999ddf77ab3c1557d36f6 SHA1 cee586adb2f935738a850bdd8a3c7760ce385929 SHA256 09abbd9f70e65d92e884ae455a78a2b4cabbb2b1738e66073c22be5549ed4e94
EBUILD gnusound-0.6.2.ebuild 1331 RMD160 0212cfde72e7cd1eab9caab3e54a3d4dd94081b0 SHA1 33178599b866366c97e33af2ce0b4ed93330c338 SHA256 b5e12d277157599649b32a26b2ec25c8712a1fa2abbaecc7eb98a160a503eb7a
MD5 97129bc6a2d6e282221b1eecf07b0d90 gnusound-0.6.2.ebuild 1331
RMD160 0212cfde72e7cd1eab9caab3e54a3d4dd94081b0 gnusound-0.6.2.ebuild 1331
SHA256 b5e12d277157599649b32a26b2ec25c8712a1fa2abbaecc7eb98a160a503eb7a gnusound-0.6.2.ebuild 1331
+EBUILD gnusound-0.7.4.ebuild 2425 RMD160 25f341d4c68c88ffea9fe1eec7f4e7a231edc798 SHA1 359eff69019b7d4db950dd8905981566bdefeb53 SHA256 0efd4b654b79e59db1c28c7ff9d62f9ffa48b09dc023dda930ce1c8547b66ccf
+MD5 8ea5cf63df747725dba4b9ff5df59d6f gnusound-0.7.4.ebuild 2425
+RMD160 25f341d4c68c88ffea9fe1eec7f4e7a231edc798 gnusound-0.7.4.ebuild 2425
+SHA256 0efd4b654b79e59db1c28c7ff9d62f9ffa48b09dc023dda930ce1c8547b66ccf gnusound-0.7.4.ebuild 2425
EBUILD gnusound-0.7.ebuild 1288 RMD160 797a9eaf4dc37690937088ecac39cf3c6c12132a SHA1 c53819a0639a768ba11bb3fc5a0d4a03770c4c9f SHA256 02950ae9ed1aeee138427e37ec4326fa658463e79a281fd9a5f96533198da691
MD5 7b18357d587fce4ee0dd76340a595780 gnusound-0.7.ebuild 1288
RMD160 797a9eaf4dc37690937088ecac39cf3c6c12132a gnusound-0.7.ebuild 1288
SHA256 02950ae9ed1aeee138427e37ec4326fa658463e79a281fd9a5f96533198da691 gnusound-0.7.ebuild 1288
-MISC ChangeLog 1661 RMD160 d6bf81ace31ca981eeda81979a33650a0cd06d30 SHA1 e8366ab2e6f238f5674eaf0929e9233400abb83a SHA256 b890c8606679c67682696a6e5237cf9f6319b81236d6c22d0dfbd12ccb7d0c89
-MD5 fcf9f6ffeede890312bac5bea6f4a7f4 ChangeLog 1661
-RMD160 d6bf81ace31ca981eeda81979a33650a0cd06d30 ChangeLog 1661
-SHA256 b890c8606679c67682696a6e5237cf9f6319b81236d6c22d0dfbd12ccb7d0c89 ChangeLog 1661
+MISC ChangeLog 2033 RMD160 343f0c0287ece704c984ccc6090b2209171a43ed SHA1 8811387eaaea1828969871b9bbba08482f42bfc7 SHA256 f4ef7c40dc94c177119b7f2c90c2faecd469f42715506a9366a3288aa1c7d8a6
+MD5 270a203d799cd687b8b293b0180e5067 ChangeLog 2033
+RMD160 343f0c0287ece704c984ccc6090b2209171a43ed ChangeLog 2033
+SHA256 f4ef7c40dc94c177119b7f2c90c2faecd469f42715506a9366a3288aa1c7d8a6 ChangeLog 2033
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 2fc6416b1d46e2e4b4cd98881e3b6ca6 files/digest-gnusound-0.6.2 67
-RMD160 19d0eb58303702ea5a1dab07ba03a03e71c3d994 files/digest-gnusound-0.6.2 67
-SHA256 c63cfde680cd56d35a949dda6b9f02b141db9e8e0bf6c1e6746f048d48b71633 files/digest-gnusound-0.6.2 67
-MD5 0ea9eb52808da58d3b31485199b74e65 files/digest-gnusound-0.7 65
-RMD160 751270083b8f5c35413fd139cd507e411daaaf52 files/digest-gnusound-0.7 65
-SHA256 3355acbb93a1eb08df8b78fb6b0a5ee43be78a480b4ae37e5de7e920ba0ba322 files/digest-gnusound-0.7 65
+MD5 b053ba58246df47f2bd64ab9211c6022 files/digest-gnusound-0.6.2 247
+RMD160 e37d95b594aa48d687af0c6e9069fd870ea0159d files/digest-gnusound-0.6.2 247
+SHA256 d69c623d6f14105c8300968112ba2cae62b0f47b79507486c47c41f567481dec files/digest-gnusound-0.6.2 247
+MD5 7c751e3f469c298d5f36980bf893fb5f files/digest-gnusound-0.7 241
+RMD160 ec12e05a0bd26b2c89af648f541ff676df3f89ea files/digest-gnusound-0.7 241
+SHA256 ceba392e856b88e07cfd6874250432914f17bea09ef60a74f359adb0de292b4d files/digest-gnusound-0.7 241
+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
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFEkyD4AiZjviIA2XgRAuiqAKCSYz1V19rMHb4GCzmPIhBjxhaisgCfUH9G
-RYpNgyJ1C+YGFXfxqIWDnL8=
-=b21p
+iD8DBQFFbd3IvFcC4BYPU0oRAtG5AJ9hOHBE7yFxrtHI1AGQzejL2jT2jgCghNBN
+VjMa8Bwv90JO54Pr+P5H1P4=
+=mhiB
-----END PGP SIGNATURE-----
MD5 78daa3950cedea53a4f7c21432f6ae85 gnusound-0.6.2.tar.bz2 256284
+RMD160 fbfa0249b6804707d491f5b74abdfceba9834285 gnusound-0.6.2.tar.bz2 256284
+SHA256 f70cbb3ecf4c81b7c3fec2949d32d47710e9255d4b522fa02811637143fe56bc gnusound-0.6.2.tar.bz2 256284
MD5 ea3c2a3326cf096db3e3be7ca9bd4ba5 gnusound-0.7.tar.bz2 538950
+RMD160 4985aa1cf66e75eed7c999ddf77ab3c1557d36f6 gnusound-0.7.tar.bz2 538950
+SHA256 09abbd9f70e65d92e884ae455a78a2b4cabbb2b1738e66073c22be5549ed4e94 gnusound-0.7.tar.bz2 538950
--- /dev/null
+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
+# Copyright 1999-2006 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.1 2006/11/29 19:23:12 aballier Exp $
+
+inherit toolchain-funcs
+
+IUSE="3dnow alsa audiofile cpudetection flac ffmpeg jack lame libsamplerate mmx
+ogg oss sse vorbis"
+
+WANT_ATUOMAKE=1.8
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
+
+DESCRIPTION="GNUsound is a sound editor for Linux/x86"
+HOMEPAGE="http://gnusound.sourceforge.net/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -sparc ~x86"
+
+DEPEND=">=gnome-base/libglade-2.0.1
+ >=gnome-base/libgnomeui-2.2.0.1
+ audiofile? ( >=media-libs/audiofile-0.2.3 )
+ flac? ( media-libs/flac )
+ ffmpeg? ( media-video/ffmpeg )
+ ogg? ( media-libs/libogg )
+ lame? ( media-sound/lame )
+ media-libs/libsndfile
+ vorbis? ( media-libs/libvorbis )
+ libsamplerate? ( media-libs/libsamplerate )"
+
+pkg_setup() {
+ required_audio_drivers="alsa jack oss"
+ ok=false
+ for i in $required_audio_drivers; do
+ use $i && ok=true
+ done
+ if test "$ok" = "false"; then
+ die "In order to run ${PN}, you must enable at least one of those use flags: ${required_audio_drivers}"
+ fi
+}
+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"
+
+ AT_M4DIR="config" eaclocal
+ eautoconf
+}
+
+src_compile() {
+ myconf="--disable-fastmemcpy"
+ use mmx && use sse && use 3dnow && myconf="--enable-fastmemcpy"
+ # Doesnt detect gnome2 if sndfile is off
+ econf \
+ $(use_enable audiofile) \
+ $(use_enable lame) \
+ --enable-sndfile \
+ $(use_enable ogg) \
+ $(use_enable vorbis) \
+ $(use_enable ffmpeg) \
+ --disable-gmerlin \
+ $(use_enable flac) \
+ $(use_enable oss) \
+ $(use_enable alsa) \
+ $(use_enable jack) \
+ $(use_with libsamplerate) \
+ $(use_enable cpudetection) \
+ $(use_enable mmx fastminmax) \
+ ${myconf} \
+ --with-gnome2 \
+ || die "Configure failure"
+ emake CC=$(tc-getCC) || die "Make failure"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "make install failed"
+ dodoc README NOTES TODO CHANGES
+}
projects / gentoo.git / commitdiff