diff options
| -rw-r--r-- | app-cdr/k3b/Manifest | 5 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch | 165 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch | 19 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-0.12.17.ebuild | 137 |
4 files changed, 0 insertions, 326 deletions
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index 005626b18883..30fe3abe801d 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -1,15 +1,10 @@ -AUX k3b-0.12.17+flac-1.1.3.patch 5567 RMD160 a20b5ae7a752b9f91c479218e75ba173af48be44 SHA1 41eae878580d21341ef6b1549a7d43df39c470d6 SHA256 4df6f523d8a05485bf1ccd3cda367460d234dc1b47564e6e8a52bfa58413149c -AUX k3b-0.12.17-flac-beta.patch 1282 RMD160 c91a54ca3f54e34cd6805b39e5bbbdc058eaa394 SHA1 53a79cb65025ea4a2f31096a891f750b0b7711c9 SHA256 6f74700e5920ac2ec751ee16a8933cb3de5a6b3d6ea90d3a4e1d3d3815b7b8bc AUX k3b-1.0.5-desktop-entry.diff 1756 RMD160 540b5336fde1206eba74ac25a4fd0276978ad9c6 SHA1 d817a1da34cc6207a1d5fcac0d5ba67a3964afc0 SHA256 3d89ee4194abe8312e7373161bac8b9134850906be9c6e738571f9de7adfb34b AUX k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch 2991 RMD160 8d0204a12cfe1eabe03e66b6201e2164f01cd80d SHA1 6bab88b9e4619a7f61b82c6e59af9a7ef784f71b SHA256 e2db198914acbda0c33c20537449cf7b729345f9d8af0052701259de0b27ff21 AUX k3b-1.0.5-ffmpeg-0.4.9_p20081014-API.patch 1049 RMD160 022fecbc707775adc782b828bfdd571eccb95936 SHA1 270f19b05ce7ca35aee0dd7009556fec9b66f90c SHA256 e99f6b309e6c20d085860c495c2aa9d34d6d69a864e0be11aac01e0b3a6ac67d -DIST k3b-0.12.17.tar.bz2 4008650 RMD160 bb791d7d003285f6623229eae213cf224fd3a128 SHA1 ae23be594b6e2c116fd4c2af8cefb438423d1285 SHA256 067ef9d621bed9a1c385c201b13810f11305edf03a7da0793cb059bb578700b7 DIST k3b-1.0.4.tar.bz2 5115790 RMD160 495090c36744e9a5ccd02621209eda2462c93476 SHA1 c420c6ca3a1f7405081a85014ef3e3f70e269223 SHA256 2b384127c330bf6c9ef5d08733b0da2d815aec66893a8fc628b746181f06d4bb DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df -DIST k3b-i18n-0.12.17.tar.bz2 5714933 RMD160 f36c4ea2da170d5c0a797a2c966b2497ac671abd SHA1 5a735d0fe7dc0d57889eabc2855f4aff3ed6be58 SHA256 2eb4fbcc7f1475485676f20707f179b4b4745d97a18bf8e80ee4001ebf24546a DIST k3b-i18n-1.0.4.tar.bz2 7581613 RMD160 910e64ef0c08cada51f17e31c902eb01d5bbf5be SHA1 e111ba113c2ff47730bc5cb4a7f6f88911bc2b94 SHA256 a2627ac27d4a821a903b5a04ef927d025e5db1a0b41517ff4930c4a5c76f3352 DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767 -EBUILD k3b-0.12.17.ebuild 3645 RMD160 dd4648d745b5987fd95017bce697de1a3e56c321 SHA1 0000251d96019ecb3b1289603f70efb64c74c4d9 SHA256 077112a79739d88eabb2fc9c4def003a36fa4b2be0a3d46bbe02e18657778b19 EBUILD k3b-1.0.4.ebuild 4255 RMD160 ccdc0eb639e96ac360907d6bc67841633f949cb6 SHA1 804b49671d2f687b4cb83b5a5309500879b9588f SHA256 5fb468f6cb7676cbee6e814f73eb00767a13ec6232f6bdca2fd19b4f442b9a37 EBUILD k3b-1.0.5-r3.ebuild 4473 RMD160 af02904b93875062ca84074c27481fccfb2a3f7e SHA1 624def63767a9296619ded6fa412c9c82d394495 SHA256 99f046d3e0393e5c3963d84791cbfdded6f59a2718861bbad082097a68520258 MISC ChangeLog 31153 RMD160 17e3bc99d41254876de6399fca97768044a78418 SHA1 5ca1ee08cb5ef0b957f90a7e83c5a26d99d797bb SHA256 2a9ede473d7aa010f5ba7e3b13ec26d9c155c3709ac83bd37f5ab57b5a50e863 diff --git a/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch b/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch deleted file mode 100644 index fdfa0563a075..000000000000 --- a/app-cdr/k3b/files/k3b-0.12.17+flac-1.1.3.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- k3b-0.12.17/configure.in.in 2006-08-23 00:32:30.000000000 -0700 -+++ k3b-0.12.17-b2/configure.in.in 2006-10-17 19:23:48.000000000 -0700 -@@ -248,7 +248,7 @@ - have_flac=no - if test "$ac_cv_use_flac" = "yes"; then - KDE_CHECK_HEADERS(FLAC++/decoder.h, [ -- AC_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single, -+ AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single, - have_flac=yes,[],$all_libraries)]) - - # Hack to get the flac version since I was not able to handle the code from ---- k3b-0.12.17/plugins/decoder/flac/k3bflacdecoder.cpp 2006-08-23 00:31:46.000000000 -0700 -+++ k3b-0.12.17-b2/plugins/decoder/flac/k3bflacdecoder.cpp 2006-10-18 14:32:24.000000000 -0700 -@@ -36,11 +36,21 @@ - #include <taglib/flacfile.h> - #endif - -+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - K_EXPORT_COMPONENT_FACTORY( libk3bflacdecoder, K3bPluginFactory<K3bFLACDecoderFactory>( "libk3bflacdecoder" ) ) - - - class K3bFLACDecoder::Private -+#ifdef LEGACY_FLAC - : public FLAC::Decoder::SeekableStream -+#else -+ : public FLAC::Decoder::Stream -+#endif - { - public: - void open(QFile* f) { -@@ -64,7 +74,11 @@ - } - - Private(QFile* f) -+#ifdef LEGACY_FLAC - : FLAC::Decoder::SeekableStream(), -+#else -+ : FLAC::Decoder::Stream(), -+#endif - comments(0) { - internalBuffer = new QBuffer(); - internalBuffer->open(IO_ReadWrite); -@@ -93,10 +107,17 @@ - FLAC__uint64 samples; - - protected: -+#ifdef LEGACY_FLAC - virtual FLAC__SeekableStreamDecoderReadStatus read_callback(FLAC__byte buffer[], unsigned *bytes); - virtual FLAC__SeekableStreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset); - virtual FLAC__SeekableStreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset); - virtual FLAC__SeekableStreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length); -+#else -+ virtual FLAC__StreamDecoderReadStatus read_callback(FLAC__byte buffer[], size_t *bytes); -+ virtual FLAC__StreamDecoderSeekStatus seek_callback(FLAC__uint64 absolute_byte_offset); -+ virtual FLAC__StreamDecoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset); -+ virtual FLAC__StreamDecoderLengthStatus length_callback(FLAC__uint64 *stream_length); -+#endif - virtual bool eof_callback(); - virtual void error_callback(FLAC__StreamDecoderErrorStatus){}; - virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata); -@@ -112,6 +133,7 @@ - return file->atEnd(); - } - -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[], unsigned *bytes) { - long retval = file->readBlock((char *)buffer, (*bytes)); - if(-1 == retval) { -@@ -121,7 +143,19 @@ - return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; - } - } -+#else -+FLAC__StreamDecoderReadStatus K3bFLACDecoder::Private::read_callback(FLAC__byte buffer[], size_t *bytes) { -+ long retval = file->readBlock((char *)buffer, (*bytes)); -+ if(-1 == retval) { -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; -+ } else { -+ (*bytes) = retval; -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; -+ } -+} -+#endif - -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamDecoderSeekStatus - K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) { - if(file->at(absolute_byte_offset) == FALSE) -@@ -129,18 +163,43 @@ - else - return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; - } -+#else -+FLAC__StreamDecoderSeekStatus -+K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) { -+ if(file->at(absolute_byte_offset) == FALSE) -+ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; -+ else -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK; -+} -+#endif - -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamDecoderTellStatus - K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) { - (*absolute_byte_offset) = file->at(); - return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; - } -+#else -+FLAC__StreamDecoderTellStatus -+K3bFLACDecoder::Private::tell_callback(FLAC__uint64 *absolute_byte_offset) { -+ (*absolute_byte_offset) = file->at(); -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK; -+} -+#endif - -+#ifdef LEGACY_FLAC - FLAC__SeekableStreamDecoderLengthStatus - K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) { - (*stream_length) = file->size(); - return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; - } -+#else -+FLAC__StreamDecoderLengthStatus -+K3bFLACDecoder::Private::length_callback(FLAC__uint64 *stream_length) { -+ (*stream_length) = file->size(); -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; -+} -+#endif - - - void K3bFLACDecoder::Private::metadata_callback(const FLAC__StreamMetadata *metadata) { -@@ -260,6 +319,7 @@ - int bytesCopied; - int bytesAvailable; - -+#ifdef LEGACY_FLAC - if(d->internalBuffer->size() == 0) { - // want more data - switch(d->get_state()) { -@@ -274,6 +334,19 @@ - return -1; - } - } -+#else -+ if(d->internalBuffer->size() == 0) { -+ // want more data -+ if(d->get_state() == FLAC__STREAM_DECODER_END_OF_STREAM) -+ d->finish(); -+ else if(d->get_state() < FLAC__STREAM_DECODER_END_OF_STREAM) { -+ if(! d->process_single()) -+ return -1; -+ } -+ else -+ return -1; -+ } -+#endif - - bytesAvailable = d->internalBuffer->size() - d->internalBuffer->at(); - bytesToCopy = QMIN(maxLen, bytesAvailable); diff --git a/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch b/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch deleted file mode 100644 index 812d405b06ab..000000000000 --- a/app-cdr/k3b/files/k3b-0.12.17-flac-beta.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: k3b-0.12.17/configure.in.in -=================================================================== ---- k3b-0.12.17.orig/configure.in.in -+++ k3b-0.12.17/configure.in.in -@@ -22,11 +22,11 @@ if test "$ac_cv_use_flac" = "yes"; then - # Hack to get the flac version since I was not able to handle the code from - # the flac guys. This is a strange usage of tr but I don't know too much about - # shell scripting and this works, so... - # BUT: this does not work if we want to use another flac version than the one installed - # where the flac binary is found! -- K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d "." -f 1` -- K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d "." -f 2` -- K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d "." -f 3` -+ K3B_FLAC_VERSION_MAJOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 1` -+ K3B_FLAC_VERSION_MINOR=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 2` -+ K3B_FLAC_VERSION_PATCHLEVEL=`flac --version|tr -d "flac "|cut -d '-' -f 1|cut -d "." -f 3` - if test \( "$K3B_FLAC_VERSION_MAJOR" -gt 1 -o \ - \( "$K3B_FLAC_VERSION_MAJOR" -eq 1 -a \( "$K3B_FLAC_VERSION_MINOR" -gt 1 -o \ - \( "$K3B_FLAC_VERSION_MINOR" -eq 1 -a "$K3B_FLAC_VERSION_PATCHLEVEL" -gt 1 \) \ diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild deleted file mode 100644 index b3dc3abb6aeb..000000000000 --- a/app-cdr/k3b/k3b-0.12.17.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.17 2008/07/07 19:39:26 loki_val Exp $ - -inherit kde eutils - -DESCRIPTION="K3b, KDE CD Writing Software" -HOMEPAGE="http://www.k3b.org/" -SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" -IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis" - -DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) ) - hal? ( dev-libs/dbus-qt3-old sys-apps/hal ) - media-libs/libsamplerate - media-libs/taglib - >=media-sound/cdparanoia-3.9.8 - sndfile? ( media-libs/libsndfile ) - ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 ) - flac? ( media-libs/flac ) - mp3? ( media-libs/libmad ) - musepack? ( media-libs/libmpcdec ) - vorbis? ( media-libs/libvorbis ) - musicbrainz? ( =media-libs/musicbrainz-2* ) - encode? ( media-sound/lame ) - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND} - virtual/cdrtools - >=app-cdr/cdrdao-1.1.7-r3 - media-sound/normalize - dvdr? ( app-cdr/dvd+rw-tools ) - css? ( media-libs/libdvdcss ) - encode? ( media-sound/sox - media-video/transcode ) - vcd? ( media-video/vcdimager )" - -DEPEND="${DEPEND} - dev-util/pkgconfig" - -need-kde 3.4 - -I18N="${PN}-i18n-${PV}" - -# Supported languages and translated documentation -LANGS="af bg bn br bs ca cs cy da de el en_GB es et eu fi fr ga he hi hu is it -ja km lt mk ms nb nds nl nn pa pl pt pt_BR ro ru se sl sr sr@Latn sv ta tr uk -zh_CN zh_TW" - -for X in ${LANGS}; do - SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )" - IUSE="${IUSE} linguas_${X}" -done - -pkg_setup() { - if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then - eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled," - eerror "but sys-apps/dbus is not built with Qt3 support." - die "rebuild sys-apps/dbus with the qt3 useflag" - fi - - if use flac && ! built_with_use --missing true media-libs/flac cxx; then - eerror "To build ${PN} with flac support you need the C++ bindings for flac." - eerror "Please enable the cxx USE flag for media-libs/flac" - die "Missing FLAC C++ bindings." - fi - - kde_pkg_setup -} - -src_unpack() { - kde_src_unpack - - if [ -d "${WORKDIR}/${I18N}" ]; then - cd "${WORKDIR}/${I18N}" - for X in ${LANGS}; do - use linguas_${X} || rm -rf "${X}" - done - rm -f configure - fi - - cd "${S}" - epatch "${FILESDIR}/${P}+flac-1.1.3.patch" - epatch "${FILESDIR}/${P}-flac-beta.patch" - rm -f "${S}/configure" -} - -src_compile() { - local myconf="--with-external-libsamplerate \ - --without-resmgr \ - $(use_with kde k3bsetup) \ - $(use_with hal) \ - $(use_with encode lame) \ - $(use_with ffmpeg) \ - $(use_with flac) \ - $(use_with vorbis oggvorbis) \ - $(use_with sndfile) \ - $(use_with mp3 libmad) \ - $(use_with musepack) \ - $(use_with musicbrainz) \ - $(use_with alsa)" - - # Build process of K3b - kde_src_compile - - # Build process of K3b-i18n - if [ -d "${WORKDIR}/${I18N}" ]; then - KDE_S="${WORKDIR}/${I18N}" \ - kde_src_compile - fi -} - -src_install() { - kde_src_install - dodoc FAQ KNOWNBUGS PERMISSIONS - - if [ -d "${WORKDIR}/${I18N}" ]; then - KDE_S="${WORKDIR}/${I18N}" \ - kde_src_install - fi - - # Move menu entry - if use kde; then - mv "${D}"/usr/share/applnk/Settings/System/k3bsetup2.desktop "${D}"/usr/share/applications/kde/ - fi - rm -fR "${D}"/usr/share/applnk/ -} - -pkg_postinst() { - echo - elog "Make sure you have proper read/write permissions on the cdrom device(s)." - elog "Usually, it is sufficient to be in the cdrom group." - echo -} |