--- /dev/null
+AUX k3b-1.0.5-conditional_inclusion.patch 544 RMD160 698722d08b7a99647bb30219bbd452c7ca5e89f0 SHA1 0ddb8998ed34c0f0947aa4dbf08bd8b7e0069b5a SHA256 4b581823144a5aa17075ba7d4da32be947d313b4ebf42f26c07481941f71418e
+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
+AUX k3b-1.0.5-libmpcdecsv7.patch 1452 RMD160 a471ea325226e5ced0c84d6a9ea1f27dcbc21e17 SHA1 6f09c5a943416d1652f6a5ffa7bb99d3ee576dba SHA256 7c9061027d7c49f637d768b4a45039f0a653895929e35c16ea04a5da936f75a7
+AUX k3b-1.0.5-transcode-1.1.patch 1097 RMD160 08fcc3769803a400bc5d00be223b9f37fdc7e7d0 SHA1 68547f4e312dc30c6440bed126a4408716b78e13 SHA256 8317afcf5e26dd5195065f2eb3b062e41804c46afe9d3c906012dee6249290f4
+DIST k3b-1.0.5.tar.bz2 5113060 RMD160 b562746015cc2e4226652402725b4e69eb846822 SHA1 c45d6f2a36b1bc7ea14101d444149c40fd4b700e SHA256 d4f9799f234ade98b7e417d1493de3bd4a44fd937e813c2beb29eba02cda50df
+DIST k3b-i18n-1.0.5.tar.bz2 7732137 RMD160 6f08c6851da5d25ed4b2ead4ad0c4073ba94e246 SHA1 8697c0f0a9fa458895519a5d94c50120333a71c8 SHA256 068b170cd63c97263d21165b7b5106a8176f2499a1ebcec9baa68b7628395767
+EBUILD k3b-1.0.5-r3.ebuild 4561 RMD160 c8eaa0710f09993898cb828ecae750f7570aa452 SHA1 dac692563487af5b83e6844fa63b0244fd2ffb72 SHA256 e62acf7da3d23d40fb9ad890fee0255cbe23471744e9fa7d925c333c605ec8a2
+EBUILD k3b-1.0.5-r5.ebuild 3945 RMD160 0cb3e8c8a48df7beef6faf76e8334f8565de2907 SHA1 3d101a7fced1a0cd028eb4f16e526a3363efec5c SHA256 bd92bcd4b7486b98d01e4145f3701afaae85c2dc923a756bc6cfa26ae9929500
+EBUILD k3b-1.0.5-r6.ebuild 3929 RMD160 17bdff4f45d7516a40846359bcbc258827eec1d5 SHA1 8a90169f4129e22acbbe7ff1310d79b3d139e377 SHA256 11c497807f4085b437dd732487003bc42cfa71238f05c0440282b3d5b39c0184
--- /dev/null
+diff -Nur k3b-1.0.5/src/rip/k3bpatternparser.cpp k3b-1.0.5-orig/src/rip/k3bpatternparser.cpp
+--- k3b-1.0.5-orig/src/rip/k3bpatternparser.cpp 2008-12-23 16:26:55.000000000 +0100
++++ k3b-1.0.5/src/rip/k3bpatternparser.cpp 2008-05-27 10:24:04.000000000 +0200
+@@ -197,7 +197,7 @@
+ QString inclusion;
+ bool isIncluded;
+
+- static QRegExp conditionrx( "^[@|!][atyegrmx](?:='.*')?\\{" );
++ static QRegExp conditionrx( "^[@|!][atyegrmxC](?:='.*')?\\{" );
+ conditionrx.setMinimal( TRUE );
+
+ for( unsigned int i = 0; i < dir.length(); ++i ) {
--- /dev/null
+--- src/k3b-cue.desktop.orig 2008-06-07 03:10:55.000000000 +0200
++++ src/k3b-cue.desktop 2008-06-07 03:11:06.000000000 +0200
+@@ -10,5 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-cue;
+-
+-Encoding=UTF-8
+--- src/k3b-iso.desktop.orig 2008-06-07 03:09:54.000000000 +0200
++++ src/k3b-iso.desktop 2008-06-07 03:10:46.000000000 +0200
+@@ -10,4 +10,3 @@
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+ MimeType=application/x-iso;
+-Encoding=UTF-8
+--- src/k3b.desktop.orig 2008-06-07 03:11:28.000000000 +0200
++++ src/k3b.desktop 2008-06-07 03:12:05.000000000 +0200
+@@ -1,9 +1,8 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Exec=k3b %U
+ Icon=k3b
+-DocPath=k3b/index.html
++X-DocPath=k3b/index.html
+ GenericName=CD & DVD Burning
+ GenericName[af]=CD & DVD Skrywer
+ GenericName[ar]= اعداد كتابة القرص المدمج(CD) و القرص المرئي الرقمي (DVD)
+@@ -117,8 +116,8 @@
+ Name[ar]= K3b
+ Name[bn]=কে-থ্রি-বি
+ Name[hi]=के3बी
+-MimeType=application/x-k3b
++MimeType=application/x-k3b;
+ X-KDE-StartupNotify=true
+ X-KDE-NativeMimeType=application/x-k3b;application/x-iso
+-Categories=KDE;Application;AudioVideo;DiscBurning;
++Categories=KDE;AudioVideo;DiscBurning;
+ X-DCOP-ServiceType=Unique
+--- src/Makefile.am.orig 2008-06-07 03:18:31.000000000 +0200
++++ src/Makefile.am 2008-06-07 03:19:31.000000000 +0200
+@@ -32,10 +32,7 @@
+
+ SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
+
+-xdg_apps_DATA = k3b.desktop
+-
+-silent_DATA = k3b-iso.desktop k3b-cue.desktop
+-silentdir = $(kde_appsdir)/.hidden/
++xdg_apps_DATA = k3b.desktop k3b-iso.desktop k3b-cue.desktop
+
+ ###################
+ # this 10 paths are KDE specific. Use them:
--- /dev/null
+diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/configure.in 2008-07-07 20:39:13.000000000 +0200
+@@ -574,12 +574,12 @@
+ AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(
+ extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
++ #include <libavformat/avformat.h>
++ #include <libavcodec/avcodec.h>
+ }
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+@@ -589,12 +589,12 @@
+ [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ OLD_LIBS=$LIBS
+ LIBS="-lavformat -lavcodec $LIBS"
+ AC_LINK_IFELSE(
+ extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
++ #include <libavformat/avformat.h>
++ #include <libavcodec/avcodec.h>
+ }
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-07-07 20:43:02.000000000 +0200
+@@ -19,12 +19,12 @@
+ AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(
+ extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
++ #include <libavformat/avformat.h>
++ #include <libavcodec/avcodec.h>
+ }
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+@@ -34,12 +34,12 @@
+ [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ OLD_LIBS=$LIBS
+ LIBS="-lavformat -lavcodec $LIBS"
+ AC_LINK_IFELSE(
+ extern "C" {
+- #include <ffmpeg/avformat.h>
+- #include <ffmpeg/avcodec.h>
++ #include <libavformat/avformat.h>
++ #include <libavcodec/avcodec.h>
+ }
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-07-07 20:45:07.000000000 +0200
+@@ -20,11 +20,11 @@
+
+ #include <kdebug.h>
+ #include <k3bpluginfactory.h>
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+
+ #include <math.h>
+
+
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-07-07 20:44:02.000000000 +0200
+@@ -16,12 +16,12 @@
+ #include <config.h>
+
+ #include "k3bffmpegwrapper.h"
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include <string.h>
+
+ #include <klocale.h>
--- /dev/null
+Index: k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -194,7 +194,7 @@ QString K3bFFMpegFile::typeComment() con
+ return i18n("Windows Media v1");
+ case CODEC_ID_WMAV2:
+ return i18n("Windows Media v2");
+- case CODEC_ID_MP3LAME:
++ case CODEC_ID_MP3:
+ return i18n("MPEG 1 Layer III");
+ case CODEC_ID_AAC:
+ return i18n("Advanced Audio Coding (AAC)");
+@@ -290,7 +290,8 @@ int K3bFFMpegFile::fillOutputBuffer()
+ #ifdef FFMPEG_BUILD_PRE_4629
+ int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
+ #else
+- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
++ d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
+ #endif
+ (short*)d->outputBuffer, &d->outputBufferSize,
+ d->packetData, d->packetSize );
--- /dev/null
+diff -ur k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in 2008-05-27 11:34:23.000000000 +0300
++++ k3b-1.0.5/configure.in 2009-07-26 18:07:39.000000000 +0300
+@@ -770,13 +770,13 @@
+
+ dnl - search for both the new and the old naming -
+
+- KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+- AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++ KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++ AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+ have_mpc=yes
+- MPC_LIBS="-lmpcdec"
++ MPC_LIBS="-lmpcdecsv7"
+ AC_DEFINE(
+ MPC_HEADER_FILE,
+- <mpcdec/mpcdec.h>,
++ <mpcdecsv7/mpcdec.h>,
+ [The header to include for MPC decoding.])
+ ],
+ [], [], [])
+diff -ur k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in k3b-1.0.5/plugins/decoder/musepack/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/musepack/configure.in.in 2008-05-27 11:23:36.000000000 +0300
++++ k3b-1.0.5/plugins/decoder/musepack/configure.in.in 2009-07-26 18:00:10.000000000 +0300
+@@ -14,13 +14,13 @@
+
+ dnl - search for both the new and the old naming -
+
+- KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
+- AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
++ KDE_CHECK_HEADERS(mpcdecsv7/mpcdec.h, [
++ AC_CHECK_LIB(mpcdecsv7, mpc_decoder_setup, [
+ have_mpc=yes
+- MPC_LIBS="-lmpcdec"
++ MPC_LIBS="-lmpcdecsv7"
+ AC_DEFINE(
+ MPC_HEADER_FILE,
+- <mpcdec/mpcdec.h>,
++ <mpcdecsv7/mpcdec.h>,
+ [The header to include for MPC decoding.])
+ ],
+ [], [], [])
--- /dev/null
+--- k3b-1.0.5.orig/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp 2008-05-27 10:24:20.000000000 +0200
++++ k3b-1.0.5/libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp 2009-05-19 18:30:07.211821502 +0200
+@@ -206,10 +206,13 @@ void K3bVideoDVDTitleTranscodingJob::sta
+ *d->process << "--nice" << "19";
+
+ // we only need 100 steps, but to make sure we use 150
++ int progressRate = ( int )m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150;
++ if ( progressRate < 1)
++ progressRate = 1;
+ if ( d->usedTranscodeBin->version.simplify() >= K3bVersion( 1, 1, 0 ) )
+- *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++ *d->process << "--progress_meter" << "2" << "--progress_rate" << QString::number(progressRate);
+ else
+- *d->process << "--print_status" << QString::number(m_dvd[m_titleNumber-1].playbackTime().totalFrames()/150);
++ *d->process << "--print_status" << QString::number(progressRate);
+
+ // the input
+ *d->process << "-i" << m_dvd.device()->blockDeviceName();
--- /dev/null
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r6.ebuild,v 1.1 2009/07/26 15:16:34 ssuominen Exp $
+
+EAPI=2
+inherit kde eutils multilib
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${P/_}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3.5"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa css dvd dvdr encode emovix ffmpeg flac hal mp3 musepack musicbrainz
+ sndfile vcd vorbis"
+
+COMMON_DEPEND="!<app-cdr/k3b-1.0.5-r5
+ media-libs/libsamplerate
+ media-libs/taglib
+ media-sound/cdparanoia
+ alsa? ( media-libs/alsa-lib )
+ dvd? ( media-libs/libdvdread )
+ encode? ( media-sound/lame )
+ ffmpeg? ( >=media-video/ffmpeg-0.5 )
+ flac? ( media-libs/flac[cxx] )
+ hal? ( sys-apps/hal )
+ mp3? ( media-libs/libmad )
+ musepack? ( media-libs/libmpcdecsv7 )
+ musicbrainz? ( media-libs/musicbrainz:1 )
+ sndfile? ( media-libs/libsndfile )
+ vorbis? ( media-libs/libvorbis )"
+RDEPEND="${COMMON_DEPEND}
+ app-cdr/cdrdao
+ media-sound/normalize
+ virtual/cdrtools
+ dvdr? ( >=app-cdr/dvd+rw-tools-7 )
+ css? ( media-libs/libdvdcss )
+ encode? ( media-sound/sox
+ media-video/transcode[dvd] )
+ emovix? ( media-video/emovix )
+ vcd? ( media-video/vcdimager )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+need-kde 3.5
+
+PATCHES=(
+ "${FILESDIR}/${P}-desktop-entry.diff"
+ "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-API.patch"
+ "${FILESDIR}/${P}-ffmpeg-0.4.9_p20081014-API.patch"
+ "${FILESDIR}/${P}-transcode-1.1.patch"
+ "${FILESDIR}/${P}-libmpcdecsv7.patch"
+ "${FILESDIR}/${P}-conditional_inclusion.patch"
+)
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation
+LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it
+ ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk
+ uz 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
+
+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
+ rm -f "${S}"/configure
+}
+
+src_configure() {
+ local myconf="--with-external-libsamplerate
+ --without-resmgr
+ --without-cdrecord-suid-root
+ --without-k3bsetup
+ --with-qt-dir=${QTDIR}
+ --enable-mt
+ --with-qt-libraries=${QTDIR}/$(get_libdir)
+ --disable-dependency-tracking
+ --without-arts
+ $(use_enable debug)
+ $(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 dvd libdvdread)
+ $(use_with alsa)"
+
+ # Build process of K3b
+ kde_src_configure
+
+ # Build process of K3b-i18n
+ if [[ -d "${WORKDIR}/${I18N}" ]]; then
+ myconf="--with-qt-dir=${QTDIR}
+ --with-qt-libraries=${QTDIR}/$(get_libdir)
+ --disable-dependency-tracking
+ --without-arts
+ $(use_enable debug)"
+
+ KDE_S="${WORKDIR}/${I18N}"
+ kde_src_configure
+ fi
+}
+
+src_compile() {
+ KDE_S="${S}"
+ kde_src_compile
+
+ if [[ -d "${WORKDIR}/${I18N}" ]]; then
+ KDE_S="${WORKDIR}/${I18N}"
+ kde_src_compile
+ fi
+}
+
+src_install() {
+ KDE_S="${S}"
+ kde_src_install
+ dodoc FAQ KNOWNBUGS PERMISSIONS || die "dodoc failed"
+
+ if [[ -d "${WORKDIR}/${I18N}" ]]; then
+ KDE_S="${WORKDIR}/${I18N}"
+ kde_src_install
+ fi
+}
+
+pkg_postinst() {
+ echo
+ elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+ elog "If you get warnings on start-up, uncheck the \"Check system"
+ elog "configuration\" option in the \"Misc\" settings window."
+ echo
+
+ local group=cdrom
+ use kernel_linux || group=operator
+ elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+ elog "Usually, it is sufficient to be in the ${group} group."
+ echo
+}
projects / overlay.git / commitdiff