Date: Thu, 28 Sep 2006 19:43:33 +0200 (CEST) From: Oliver Lehmann <oliver@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Oliver Lehmann <oliver@FreeBSD.org> Subject: ports/103769: fix build on FreeBSD 4 for multimedia/libxine Message-ID: <200609281743.k8SHhXjl057342@kartoffel.salatschuessel.net> Resent-Message-ID: <200609281750.k8SHoGfL069043@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103769 >Category: ports >Synopsis: fix build on FreeBSD 4 for multimedia/libxine >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Sep 28 17:50:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Oliver Lehmann >Release: FreeBSD 6.1-STABLE amd64 >Organization: >Environment: System: FreeBSD kartoffel.salatschuessel.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Mon Sep 11 09:55:49 CEST 2006 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.1/usr/src/sys/KARTOFFEL amd64 >Description: apply the attached patch to get libxine compiled on FreeBSD 4 take care about the 4 new patch files! >How-To-Repeat: >Fix: --- patch-libxine begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/Makefile,v retrieving revision 1.98 diff -u -r1.98 Makefile --- Makefile 20 Sep 2006 11:21:51 -0000 1.98 +++ Makefile 28 Sep 2006 17:42:31 -0000 @@ -33,6 +33,7 @@ mad.2:${PORTSDIR}/audio/libmad USE_BZIP2= yes +USE_GCC= 3.4+ USE_GETTEXT= yes USE_ICONV= yes USE_X_PREFIX= yes @@ -200,7 +201,8 @@ s|-L/usr/local/lib||g ; \ s|-I/usr/local/include||g ; \ s|-lgiconv|-liconv|g ; \ - s|-funroll-loops||g' ${WRKSRC}/configure + s|-funroll-loops||g ; \ + s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g' ${WRKSRC}/configure .if ${OSVERSION} >= 500035 @${REINPLACE_CMD} -e \ 's|-malign-loops|-falign-loops|g ; \ Index: files/patch-src:libffmpeg:libavcodec:h263.c =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c,v retrieving revision 1.7 diff -u -r1.7 patch-src:libffmpeg:libavcodec:h263.c --- files/patch-src:libffmpeg:libavcodec:h263.c 1 Aug 2006 17:18:59 -0000 1.7 +++ files/patch-src:libffmpeg:libavcodec:h263.c 28 Sep 2006 17:42:32 -0000 @@ -1,6 +1,14 @@ ---- 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 @@ +--- src/libffmpeg/libavcodec/h263.c.orig Sun Jul 9 16:38:11 2006 ++++ src/libffmpeg/libavcodec/h263.c Thu Sep 28 12:53:39 2006 +@@ -38,6 +38,7 @@ + #include "mpegvideo.h" + #include "h263data.h" + #include "mpeg4data.h" ++#include "xine_internal.h" + + //#undef NDEBUG + //#include <assert.h> +@@ -66,8 +67,8 @@ static int h263p_decode_umotion(MpegEncContext * s, int pred); static int h263_decode_block(MpegEncContext * s, DCTELEM * block, int n, int coded); @@ -11,7 +19,7 @@ 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 @@ +@@ -4684,7 +4685,7 @@ * @param dir_ptr the prediction direction will be stored here * @return the quantized dc */ @@ -20,7 +28,7 @@ { int level, code; -@@ -4729,7 +4729,7 @@ +@@ -4729,7 +4730,7 @@ * decodes a block. * @return <0 if an error occured */ Index: files/patch-src:xine-engine:xine_internal.h =================================================================== RCS file: /home/pcvs/ports/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h,v retrieving revision 1.4 diff -u -r1.4 patch-src:xine-engine:xine_internal.h --- files/patch-src:xine-engine:xine_internal.h 1 Oct 2005 18:20:02 -0000 1.4 +++ files/patch-src:xine-engine:xine_internal.h 28 Sep 2006 17:42:32 -0000 @@ -1,7 +1,7 @@ ---- src/xine-engine/xine_internal.h.orig Tue Apr 26 17:09:12 2005 -+++ src/xine-engine/xine_internal.h Sat Apr 30 14:16:33 2005 -@@ -70,6 +70,77 @@ - # include <xine/info_helper.h> +--- src/xine-engine/xine_internal.h.orig Sat Apr 22 00:46:33 2006 ++++ src/xine-engine/xine_internal.h Thu Sep 28 16:13:27 2006 +@@ -72,6 +72,124 @@ + # include <xine/alphablend.h> #endif +#ifndef INT8_MIN @@ -28,11 +28,41 @@ +#define INT32_MIN (-0x7fffffff-1) +#endif + ++#ifndef PRIdMAX ++#define PRIdMAX "lld" ++#endif ++ ++#ifndef SCNdMAX ++#define SCNdMAX "lld" ++#endif ++ +#ifndef PRIiMAX -+#define PRIiMAX "lld" ++#define PRIiMAX "lld" +typedef long long intmax_t; +#endif + ++ ++#ifndef PRId32 ++#define PRId32 "d" ++#endif ++ ++#ifndef SCNd32 ++#define SCNd32 "d" ++#endif ++ ++#ifndef PRIdFAST16 ++#define PRIdFAST16 "d" ++#endif ++ ++#ifndef PRIdFAST32 ++#define PRIdFAST32 "d" ++#endif ++ ++#ifndef SCNu32 ++#define SCNu32 "u" ++#endif ++ ++ +#ifndef PRId64 +#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) +#define PRId64 "ld" @@ -41,14 +71,31 @@ +#endif +#endif + -+#ifndef PRIdMAX -+#define PRIdMAX "lld" ++#ifndef SCNd64 ++#define SCNd64 PRId64 ++#endif ++ ++#ifndef PRIu64 ++#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) ++#define PRIu64 "lu" ++#else if defined(__i386__) || defined(__powerpc__) ++#define PRIu64 "llu" ++#endif +#endif + -+#ifndef SCNdMAX -+#define SCNdMAX "lld" ++#ifndef SCNu64 ++#define SCNu64 PRIu64 +#endif + ++#ifndef PRIX64 ++#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) ++#define PRIX64 "lX" ++#else if defined(__i386__) || defined(__powerpc__) ++#define PRIX64 "llX" ++#endif ++#endif ++ ++ +#ifndef PRIx32 +#define PRIx32 "x" +#endif Index: files/patch-src_input_input_vcd.c =================================================================== RCS file: files/patch-src_input_input_vcd.c diff -N files/patch-src_input_input_vcd.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_input_input_vcd.c 28 Sep 2006 17:42:32 -0000 @@ -0,0 +1,18 @@ +--- src/input/input_vcd.c.orig Thu Sep 28 06:51:16 2006 ++++ src/input/input_vcd.c Thu Sep 28 07:03:55 2006 +@@ -25,7 +25,6 @@ + #include "config.h" + #endif + +-#include <netinet/in.h> + #include <stdio.h> + #include <stdlib.h> + #include <sys/stat.h> +@@ -34,6 +33,7 @@ + #include <fcntl.h> + #include <sys/ioctl.h> + #include <string.h> ++#include <netinet/in.h> + #ifdef HAVE_LINUX_CDROM_H + # include <linux/cdrom.h> + #endif Index: files/patch-src_libffmpeg_libavcodec_huffyuv.c =================================================================== RCS file: files/patch-src_libffmpeg_libavcodec_huffyuv.c diff -N files/patch-src_libffmpeg_libavcodec_huffyuv.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_libffmpeg_libavcodec_huffyuv.c 28 Sep 2006 17:42:32 -0000 @@ -0,0 +1,10 @@ +--- src/libffmpeg/libavcodec/huffyuv.c.orig Thu Sep 28 13:25:07 2006 ++++ src/libffmpeg/libavcodec/huffyuv.c Thu Sep 28 13:25:32 2006 +@@ -30,6 +30,7 @@ + #include "bitstream.h" + #include "avcodec.h" + #include "dsputil.h" ++#include "xine_internal.h" + + #define VLC_BITS 11 + Index: files/patch-src_libffmpeg_libavcodec_mpegvideo.c =================================================================== RCS file: files/patch-src_libffmpeg_libavcodec_mpegvideo.c diff -N files/patch-src_libffmpeg_libavcodec_mpegvideo.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_libffmpeg_libavcodec_mpegvideo.c 28 Sep 2006 17:42:32 -0000 @@ -0,0 +1,10 @@ +--- src/libffmpeg/libavcodec/mpegvideo.c.orig Thu Sep 28 13:27:10 2006 ++++ src/libffmpeg/libavcodec/mpegvideo.c Thu Sep 28 13:27:35 2006 +@@ -30,6 +30,7 @@ + #include "mpegvideo.h" + #include "faandct.h" + #include <limits.h> ++#include "xine_internal.h" + + #ifdef USE_FASTMEMCPY + #include "fastmemcpy.h" Index: files/patch-src_libffmpeg_libavcodec_vorbis.c =================================================================== RCS file: files/patch-src_libffmpeg_libavcodec_vorbis.c diff -N files/patch-src_libffmpeg_libavcodec_vorbis.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-src_libffmpeg_libavcodec_vorbis.c 28 Sep 2006 17:42:32 -0000 @@ -0,0 +1,11 @@ +--- src/libffmpeg/libavcodec/vorbis.c.orig Thu Sep 28 13:27:16 2006 ++++ src/libffmpeg/libavcodec/vorbis.c Thu Sep 28 13:27:41 2006 +@@ -29,6 +29,8 @@ + #include "dsputil.h" + + #include "vorbis.h" ++#include "xine_internal.h" ++ + + #define V_NB_BITS 8 + #define V_NB_BITS2 11 --- patch-libxine ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609281743.k8SHhXjl057342>