diff options
author | Carsten Lohrke <carlo@gentoo.org> | 2006-02-11 17:05:43 +0000 |
---|---|---|
committer | Carsten Lohrke <carlo@gentoo.org> | 2006-02-11 17:05:43 +0000 |
commit | 39c1cbbd478424ae943cf2a4bd48a644ef7fdcb3 (patch) | |
tree | 7bafce432cf8676b6b7e0fc8ca07091a0daa31cb /app-cdr/k3b/files | |
parent | Clean up existing modular X depedencies a bit. Add modular X dependencies for (diff) | |
download | gentoo-2-39c1cbbd478424ae943cf2a4bd48a644ef7fdcb3.tar.gz gentoo-2-39c1cbbd478424ae943cf2a4bd48a644ef7fdcb3.tar.bz2 gentoo-2-39c1cbbd478424ae943cf2a4bd48a644ef7fdcb3.zip |
Version bump.
(Portage version: 2.0.54)
Diffstat (limited to 'app-cdr/k3b/files')
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.11.24 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.10 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.11 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.4a | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.5 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.6 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.7 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/digest-k3b-0.12.9 | 2 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-0.11.17-noarts.patch | 33 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-0.12.4a-qt-3.3.5.patch | 12 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-0.12.9-conditional.patch | 26 | ||||
-rw-r--r-- | app-cdr/k3b/files/k3b-dvdrip-transcode.patch | 40 |
12 files changed, 2 insertions, 125 deletions
diff --git a/app-cdr/k3b/files/digest-k3b-0.11.24 b/app-cdr/k3b/files/digest-k3b-0.11.24 deleted file mode 100644 index fd16b5e4c9dd..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.11.24 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 d30fe0bc321e1f8aeebda80c82ee3dfb k3b-0.11.24b.tar.bz2 3198948 -MD5 80d1ac1766ad8a8cdadca5f4273f2d95 k3b-i18n-0.11.tar.bz2 2738463 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.10 b/app-cdr/k3b/files/digest-k3b-0.12.10 deleted file mode 100644 index 722f522ee8e0..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.10 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 f685230ef445b36ccba42fc80b922dfa k3b-0.12.10.tar.bz2 4084756 -MD5 db3bc6d94da5b63f22bd04e981486974 k3b-i18n-0.12.10.tar.bz2 4330221 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.11 b/app-cdr/k3b/files/digest-k3b-0.12.11 new file mode 100644 index 000000000000..781576108eaf --- /dev/null +++ b/app-cdr/k3b/files/digest-k3b-0.12.11 @@ -0,0 +1,2 @@ +MD5 17fd99200517d794b206228e3f87c528 k3b-0.12.11.tar.bz2 4088788 +MD5 ea8fbd1a3419f97ba52d45660d3ba29e k3b-i18n-0.12.11.tar.bz2 4619266 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.4a b/app-cdr/k3b/files/digest-k3b-0.12.4a deleted file mode 100644 index 5f2007bed96c..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.4a +++ /dev/null @@ -1,2 +0,0 @@ -MD5 816bbf45eaa3bbcccbedc80cf0d25b42 k3b-0.12.4a.tar.bz2 3775531 -MD5 17744598d50deabe5edf3f9fc9e0af89 k3b-i18n-0.12.4a.tar.bz2 4238944 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.5 b/app-cdr/k3b/files/digest-k3b-0.12.5 deleted file mode 100644 index 5b16d1c56e4f..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 090979890229d33de3dadc263b09e621 k3b-0.12.5.tar.bz2 3777666 -MD5 da6399fb6fb8d071de36b0a4fb2111aa k3b-i18n-0.12.5.tar.bz2 4247188 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.6 b/app-cdr/k3b/files/digest-k3b-0.12.6 deleted file mode 100644 index 3ab5a9ce062b..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 a69a40e6c2f0a80b489c4d0ae9a823e8 k3b-0.12.6.tar.bz2 3773224 -MD5 b289bdc9236093c7fb70319ca743fe96 k3b-i18n-0.12.6.tar.bz2 4246694 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.7 b/app-cdr/k3b/files/digest-k3b-0.12.7 deleted file mode 100644 index e2e5254da6f8..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.7 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 fbc9e20f44781da617a67dc6bff74964 k3b-0.12.7.tar.bz2 3772254 -MD5 34d2dc54901436f7da30d5ed1645e079 k3b-i18n-0.12.7.tar.bz2 4268759 diff --git a/app-cdr/k3b/files/digest-k3b-0.12.9 b/app-cdr/k3b/files/digest-k3b-0.12.9 deleted file mode 100644 index 019c7ef06c50..000000000000 --- a/app-cdr/k3b/files/digest-k3b-0.12.9 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 32defb04c9c80299f2738791105c5c39 k3b-0.12.9.tar.bz2 4103177 -MD5 b195f36a212a395ee7cc1a263c3ca4ad k3b-i18n-0.12.9.tar.bz2 4342071 diff --git a/app-cdr/k3b/files/k3b-0.11.17-noarts.patch b/app-cdr/k3b/files/k3b-0.11.17-noarts.patch deleted file mode 100644 index ccb15bdd389a..000000000000 --- a/app-cdr/k3b/files/k3b-0.11.17-noarts.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- kdeextragear-1/k3b/configure.in.in 2004/03/16 14:07:22 1.49 -+++ kdeextragear-1/k3b/configure.in.in 2004/07/12 19:47:47 1.50 -@@ -204,16 +204,22 @@ AC_SUBST(LIBSAMPLERATE) - AM_CONDITIONAL(compile_libsamplerate, [test -z "$LIBSAMPLERATE"]) - - --dnl Find aRts - ARTS_LIBS="" --KDE_CHECK_HEADERS(arts/artsflow.h, -- [KDE_CHECK_HEADERS(arts/kmedia2.h, -- [arts_available=yes -- ARTS_LIBS="-lartskde"], -- [arts_available=no] -- )] --) -+if test "$build_arts" == "yes"; then -+ dnl Find aRts -+ KDE_CHECK_HEADERS(arts/artsflow.h, -+ [KDE_CHECK_HEADERS(arts/kmedia2.h, -+ [arts_available=yes -+ ARTS_LIBS="-lartskde"], -+ [arts_available=no] -+ )] -+ ) -+fi - AC_SUBST(ARTS_LIBS) -+AM_CONDITIONAL(include_arts, [test -n "$ARTS_LIBS"]) -+if test "$build_arts" == "yes"; and test x$arts_available = xyes; then -+ AC_DEFINE(WITH_ARTS,1,[defined if arts support is compiled in]) -+fi - - KDE_CHECK_THREADING - diff --git a/app-cdr/k3b/files/k3b-0.12.4a-qt-3.3.5.patch b/app-cdr/k3b/files/k3b-0.12.4a-qt-3.3.5.patch deleted file mode 100644 index e541555f752d..000000000000 --- a/app-cdr/k3b/files/k3b-0.12.4a-qt-3.3.5.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: extragear/multimedia/k3b/src/option/base_k3bdivxoptiontab.ui -=================================================================== ---- extragear/multimedia/k3b/src/option/base_k3bdivxoptiontab.ui (revision 460630) -+++ extragear/multimedia/k3b/src/option/base_k3bdivxoptiontab.ui (revision 460631) -@@ -326,7 +326,6 @@ - </widget> - <layoutdefaults spacing="6" margin="11"/> - <includehints> -- <includehint>kdoublenuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> - <includehint>knuminput.h</includehint> diff --git a/app-cdr/k3b/files/k3b-0.12.9-conditional.patch b/app-cdr/k3b/files/k3b-0.12.9-conditional.patch deleted file mode 100644 index 01f2fda363f1..000000000000 --- a/app-cdr/k3b/files/k3b-0.12.9-conditional.patch +++ /dev/null @@ -1,26 +0,0 @@ -AM_CONDITIONAL should be always called unconditionally, or automake -conditionals make ./configure step fail. - -Move AM_CONDITIONAL for include_ALSA in global scope. - -See Gentoo Bug #115379. - -Index: plugins/audiooutput/alsa/configure.in.in -=================================================================== ---- plugins/audiooutput/alsa/configure.in.in (revision 488109) -+++ plugins/audiooutput/alsa/configure.in.in (revision 488116) -@@ -55,7 +55,6 @@ - fi - - AC_SUBST(LIBASOUND) -- AM_CONDITIONAL(include_ALSA, [test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes]) - ]) - - AC_ARG_WITH(alsa, -@@ -72,4 +71,6 @@ - fi - fi - -+AM_CONDITIONAL(include_ALSA, [test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes]) -+ - dnl --------- ALSA CHECK END --------------- diff --git a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch deleted file mode 100644 index 652b3cc4fb62..000000000000 --- a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Narup k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp ---- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp 2004-06-02 11:31:41.000000000 +0200 -+++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp 2005-04-16 13:22:21.000000000 +0200 -@@ -83,7 +83,15 @@ void K3bDvdRippingProcess::checkRippingM - m_title = QString::number( (*m_dvd).getTitleNumber() ); - if( (*m_dvd).getMaxAngle() == 1 ) { - kdDebug() << "K3bDvdRippingProcess) Rip Title" << endl; -- m_ripMode = "-P " + m_title; -+ K3bVersion tccatVersion = k3bcore->externalBinManager()->binObject("tccat")->version; -+ kdDebug() << "(K3bDvdRippingProcess) Tccat Version: " << tccatVersion.majorVersion() << "." << tccatVersion.minorVersion() << "." << tccatVersion.patchLevel() << endl; -+ if( tccatVersion.majorVersion() == 0 && tccatVersion.minorVersion() == 6 && tccatVersion.patchLevel() < 12){ -+ //transcode <= 0.6.11 -+ m_ripMode = "-P " + m_title; -+ } else { -+ //transcode >= 0.6.12 -+ m_ripMode = "-T " + m_title + ",-1 -L"; -+ } - } else { - kdDebug() << "K3bDvdRippingProcess) Rip Angle" << endl; - // workaround due to buggy transcode, angle selection doesn't work with -1 (all chapters) -@@ -119,13 +127,19 @@ void K3bDvdRippingProcess::startRippingP - connect( m_audioProcess, SIGNAL( finished() ), this, SLOT( slotAudioProcessFinished() ) ); - m_delAudioProcess = true; - */ -+ - const K3bExternalBin *m_tccatBin = k3bcore->externalBinManager()->binObject("tccat"); -+ -+ /* -+ * This check probably not required any more -+ * - if( m_tccatBin->version >= K3bVersion( 0, 6, 12 ) ) { - emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.1.12 yet."), - ERROR ); - emit finished( false ); - return; - } -+ */ - - m_ripProcess = new KShellProcess(); - kdDebug() << "(K3bDvdRippingProcess)" << m_tccatBin->path << " -i " << m_device <<" "<< m_ripMode << endl; |