Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=11337e90d3ddde867864b1ee6060875471a4184a
commit 11337e90d3ddde867864b1ee6060875471a4184a
Author: voroskoi <[EMAIL PROTECTED]>
Date: Mon Apr 28 23:19:10 2008 +0200
k3b-1.0.4-2-x86_64
rebuilt with ffmpeg>=20080427
added ffmpeg.diff
diff --git a/source/kde/k3b/FrugalBuild b/source/kde/k3b/FrugalBuild
index 5cd9a99..29fe434 100644
--- a/source/kde/k3b/FrugalBuild
+++ b/source/kde/k3b/FrugalBuild
@@ -4,9 +4,9 @@
pkgname=k3b
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="The CD Kreator"
-depends=('flac>=1.1.4' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz'
'taglib' 'ffmpeg>=20070422' 'cdrdao' \
+depends=('flac>=1.1.4' 'libsamplerate' 'hal>=0.5.9-2' 'libmusicbrainz'
'taglib' 'ffmpeg>=20080427' 'cdrdao' \
'kdelibs>=3.5.8' 'cdrtools' 'cdparanoia' 'normalize' 'sox' 'dvd+rw-tools'
'libmad' \
'libvorbis' 'vcdimager' 'libsndfile' 'libdvdread' 'dbus-qt3' 'libmpcdec')
rodepends=('kdebase>=3.5.8')
@@ -16,10 +16,11 @@ _F_sourceforge_ext=".tar.bz2"
_F_kde_reconf=1
Finclude kde sourceforge
url="http://www.k3b.org/";
-source=($source README.Frugalware)
+source=($source README.Frugalware ffmpeg.diff)
options=('scriptlet')
Fconfopts="$Fconfopts --enable-mt"
+sha1sums=('c420c6ca3a1f7405081a85014ef3e3f70e269223' \
+ '8704ffb71684abde5b8288054ae25fda386244cc' \
+ '022089fec916e01ea5d5851f3c4a5c373da35a25')
# optimization OK
-sha1sums=('c420c6ca3a1f7405081a85014ef3e3f70e269223'\
- '8704ffb71684abde5b8288054ae25fda386244cc')
diff --git a/source/kde/k3b/ffmpeg.diff b/source/kde/k3b/ffmpeg.diff
new file mode 100644
index 0000000..5df84b9
--- /dev/null
+++ b/source/kde/k3b/ffmpeg.diff
@@ -0,0 +1,51 @@
+diff -aur k3b-1.0.4/plugins/decoder/ffmpeg/configure.in.in
fw_k3b-1.0.4/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.4/plugins/decoder/ffmpeg/configure.in.in 2007-11-02
10:55:03.000000000 +0100
++++ fw_k3b-1.0.4/plugins/decoder/ffmpeg/configure.in.in 2008-04-28
22:11:06.000000000 +0200
+@@ -21,8 +21,8 @@
+ 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() {
+@@ -36,8 +36,8 @@
+ 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() {
+diff -aur k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
fw_k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2007-11-02
10:55:03.000000000 +0100
++++ fw_k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-04-28
22:51:53.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <k3bpluginfactory.h>
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+
+ #include <math.h>
+diff -aur k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
fw_k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2007-11-02
10:55:03.000000000 +0100
++++ fw_k3b-1.0.4/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-04-28
22:30:49.000000000 +0200
+@@ -18,8 +18,8 @@
+ #include "k3bffmpegwrapper.h"
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include <string.h>
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
