ports/90426: [patch] libxine 1.1.1 failes to build

[Raaf]

>Number:         90426
>Category:       ports
>Synopsis:       [patch] libxine 1.1.1 failes to build
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 15 10:20:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Raaf
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:

System: FreeBSD 6.0-RELEASE
gcc (GCC) 3.4.4 [FreeBSD] 20050518

>Description:
	libxine 1.1.1 (cvsuped today) failes to build with an inlining error

>How-To-Repeat:
	portupgrade libxine

>Fix:
	There were already patches for this bug in older
	versions of the libxine port
	
	patch-src:libffmpeg:libavcodec:msmpeg4.c
	
	Can still be used.
	
	patch-src:libffmpeg:libavcodec:mpeg12.c
	
	Doesn't work any more, below a patch that does work.
	
	See also:
	http://www.freebsd.org/cgi/query-pr.cgi?pr=69874
	

	
--- src/libffmpeg/libavcodec/mpeg12.c.orig	Thu Dec 15 10:50:19 2005
+++ src/libffmpeg/libavcodec/mpeg12.c	Thu Dec 15 10:52:24 2005
@@ -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 int mpeg1_decode_block_inter(MpegEncContext *s, 
                               DCTELEM *block, 
                               int n);
-static inline int mpeg1_decode_block_intra(MpegEncContext *s, 
+static 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 int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
+static int mpeg2_decode_block_non_intra(MpegEncContext *s, 
                                         DCTELEM *block, 
                                         int n);
-static inline int mpeg2_decode_block_intra(MpegEncContext *s, 
+static 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 int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
+static 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);
>Release-Note:
>Audit-Trail:
>Unformatted: