2 files changed, 23 insertions, 1 deletions
diff --git a/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch
new file mode 100644
index 000000000..d16411ed7
--- /dev/null
+++ b/redhat/extras/akode/akode-2.0.2-fix_ffmpeg_include.patch
@@ -0,0 +1,15 @@
+--- a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ORI	2012-08-04 22:36:12.435734576 +0200
++++ a/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp	2012-08-04 22:37:20.153030459 +0200
+@@ -26,9 +26,9 @@
+ #include "decoder.h"
+ 
+ #include <assert.h>
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
+-#include <ffmpeg/avio.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#include <libavformat/avio.h>
+ 
+ #include "ffmpeg_decoder.h"
+ #include <iostream>
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec
index 6579f7bef..88875ec99 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode.spec
@@ -41,6 +41,7 @@ Patch4: akode-2.0.2-gcc43.patch
 
 # New patch for Fedora 16 / TDE 3.5.13
 Patch10: akode-autotools.patch
+Patch11: akode-2.0.2-fix_ffmpeg_include.patch
 
 # Optional features that are always enabled :-)
 %define _with_flac --with-flac
@@ -122,6 +123,7 @@ Requires: %{name} = %{version}-%{release}
 %patch4 -p1 -b .gcc43
 
 %patch10 -p1
+%patch11 -p1 -b .ffmpeg
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -142,7 +144,7 @@ Requires: %{name} = %{version}-%{release}
   --disable-static \
   --enable-shared \
   --disable-debug --disable-warnings --disable-dependency-tracking \
-  --with-libltdl \
+  --without-libltdl \
   --with-alsa \
   --with-oss \
   %{?_with_flac} %{!?_with_flac:--without-flac} \
@@ -204,6 +206,11 @@ done
 %{tde_libdir}/libakode_xiph_decoder.la
 %{tde_libdir}/libakode_xiph_decoder.so
 
+#files -libmad
+#   /opt/trinity/lib64/libakode_mpeg_decoder.la
+#   /opt/trinity/lib64/libakode_mpeg_decoder.so
+
+
 %files devel
 %defattr(-,root,root,-)
 %{tde_bindir}/akode-config