4 files changed, 145 insertions, 5 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 67b07e6e9a99..55e2657a96a5 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -161,11 +161,6 @@ pre-everything::
 .else
 	@${ECHO_MSG} "===> WITH_SMB (SMB support, enabled)"
 .endif
-.if !exists(${LOCALBASE}/lib/libtheora.so.2) && !defined(WITH_THEORA)
-	@${ECHO_MSG} "===> WITH_THEORA (libtheora support)"
-.else
-	@${ECHO_MSG} "===> WITH_THEORA (libtheora support, enabled)"
-.endif
 .if !exists(${X11BASE}/lib/libXvMCNVIDIA.so.1) && !defined(WITH_XVMC)
 	@${ECHO_MSG} "===> WITH_XVMC (XvMC support)"
 .else
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
new file mode 100644
index 000000000000..343662f7db50
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
@@ -0,0 +1,31 @@
+--- src/libffmpeg/libavcodec/h263.c.orig	Sun Jul  9 23:38:11 2006
++++ src/libffmpeg/libavcodec/h263.c	Wed Aug  2 01:19:03 2006
+@@ -66,8 +66,8 @@
+ static int h263p_decode_umotion(MpegEncContext * s, int pred);
+ static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
+                              int n, int coded);
+-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
+-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
++static int __inline mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
++static int __inline mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+                               int n, int coded, int intra, int rvlc);
+ static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
+                                uint8_t *scan_table);
+@@ -4684,7 +4684,7 @@
+  * @param dir_ptr the prediction direction will be stored here
+  * @return the quantized dc
+  */
+-static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
++static __inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
+ {
+     int level, code;
+ 
+@@ -4729,7 +4729,7 @@
+  * decodes a block.
+  * @return <0 if an error occured
+  */
+-static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
++static __inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+                               int n, int coded, int intra, int rvlc)
+ {
+     int level, i, last, run;
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
new file mode 100644
index 000000000000..045824107b5a
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
@@ -0,0 +1,94 @@
+--- src/libffmpeg/libavcodec/mpeg12.c.orig	Sun Jul  9 23:38:32 2006
++++ src/libffmpeg/libavcodec/mpeg12.c	Wed Aug  2 01:25:48 2006
+@@ -65,21 +65,21 @@
+                          int component);
+ static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code);    // RAL: f_code parameter added
+ #endif //CONFIG_ENCODERS
+-static inline int mpeg1_decode_block_inter(MpegEncContext *s,
++static __inline int mpeg1_decode_block_inter(MpegEncContext *s,
+                               DCTELEM *block,
+                               int n);
+-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
++static __inline int mpeg1_decode_block_intra(MpegEncContext *s,
+                               DCTELEM *block,
+                               int n);
+-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
+-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
++static __inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
++static __inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
+                                         DCTELEM *block,
+                                         int n);
+-static inline int mpeg2_decode_block_intra(MpegEncContext *s,
++static __inline int mpeg2_decode_block_intra(MpegEncContext *s,
+                                     DCTELEM *block,
+                                     int n);
+-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
+-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
++static __inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
++static __inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
+ static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
+ static void exchange_uv(MpegEncContext *s);
+ 
+@@ -1505,7 +1505,7 @@
+     return diff;
+ }
+ 
+-static inline int mpeg1_decode_block_intra(MpegEncContext *s,
++static __inline int mpeg1_decode_block_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
+@@ -1578,7 +1578,7 @@
+    return 0;
+ }
+ 
+-static inline int mpeg1_decode_block_inter(MpegEncContext *s,
++static __inline int mpeg1_decode_block_inter(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
+@@ -1656,7 +1656,7 @@
+     return 0;
+ }
+ 
+-static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
++static __inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
+ {
+     int level, i, j, run;
+     RLTable *rl = &rl_mpeg1;
+@@ -1728,7 +1728,7 @@
+ }
+ 
+ 
+-static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
++static __inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
+@@ -1809,7 +1809,7 @@
+     return 0;
+ }
+ 
+-static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
++static __inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
+@@ -1872,7 +1872,7 @@
+ }
+ 
+ 
+-static inline int mpeg2_decode_block_intra(MpegEncContext *s,
++static __inline int mpeg2_decode_block_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
+@@ -1952,7 +1952,7 @@
+     return 0;
+ }
+ 
+-static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
++static __inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
+                                DCTELEM *block,
+                                int n)
+ {
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
new file mode 100644
index 000000000000..eb3084482cca
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
@@ -0,0 +1,20 @@
+--- src/libffmpeg/libavcodec/msmpeg4.c.orig	Sun Jul  9 23:38:34 2006
++++ src/libffmpeg/libavcodec/msmpeg4.c	Wed Aug  2 01:27:48 2006
+@@ -60,7 +60,7 @@
+ static uint32_t v2_dc_chroma_table[512][2];
+ 
+ static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
+-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
++static __inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+                                        int n, int coded, const uint8_t *scantable);
+ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
+ static int msmpeg4_decode_motion(MpegEncContext * s,
+@@ -1659,7 +1659,7 @@
+     return 0;
+ }
+ //#define ERROR_DETAILS
+-static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
++static __inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
+                               int n, int coded, const uint8_t *scan_table)
+ {
+     int level, i, last, run, run_diff;