From raaf@luna.afraid.org  Thu Dec 15 10:11:40 2005
Return-Path: <raaf@luna.afraid.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8C47116A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Dec 2005 10:11:40 +0000 (GMT)
	(envelope-from raaf@luna.afraid.org)
Received: from gw.luna.afraid.org (lls-c-13303.adsl.wanadoo.nl [81.69.81.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 25BE643D46
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Dec 2005 10:11:39 +0000 (GMT)
	(envelope-from raaf@luna.afraid.org)
Received: by gw.luna.afraid.org (Postfix, from userid 1001)
	id 5795F9B; Thu, 15 Dec 2005 11:11:37 +0100 (CET)
Message-Id: <20051215101137.5795F9B@gw.luna.afraid.org>
Date: Thu, 15 Dec 2005 11:11:37 +0100 (CET)
From: Raaf <raaf@luna.afraid.org>
Reply-To: Raaf <raaf@luna.afraid.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] libxine 1.1.1 failes to build
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90426
>Category:       ports
>Synopsis:       [patch] libxine 1.1.1 failes to build
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    nobutaka
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 15 10:20:04 GMT 2005
>Closed-Date:    Sun Dec 18 13:55:23 GMT 2005
>Last-Modified:  Sun Dec 18 13:55:23 GMT 2005
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->nobutaka 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Dec 15 11:03:26 UTC 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90426 
State-Changed-From-To: open->closed 
State-Changed-By: nobutaka 
State-Changed-When: Sun Dec 18 13:52:51 UTC 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90426 
>Unformatted:
