From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 15 10:20:06 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B55916A41F for ; Thu, 15 Dec 2005 10:20:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C7D343D49 for ; Thu, 15 Dec 2005 10:20:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBFAK45X040201 for ; Thu, 15 Dec 2005 10:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBFAK4VK040200; Thu, 15 Dec 2005 10:20:04 GMT (envelope-from gnats) Resent-Date: Thu, 15 Dec 2005 10:20:04 GMT Resent-Message-Id: <200512151020.jBFAK4VK040200@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Raaf Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8C47116A41F for ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/90426: [patch] libxine 1.1.1 failes to build X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Raaf List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Dec 2005 10:20:06 -0000 >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: