diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2005-04-30 14:41:10 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2005-04-30 14:41:10 +0800 |
| commit | d218b8d3acdacaea8bab5f0f2f238b376cf97f30 (patch) | |
| tree | a435e312e058b49405731334485e797ddfd43da4 /multimedia/libxine | |
| parent | b47e7463586f632297026f2d68f1ac25e73d4422 (diff) | |
| download | freebsd-ports-gnome-d218b8d3acdacaea8bab5f0f2f238b376cf97f30.tar.gz freebsd-ports-gnome-d218b8d3acdacaea8bab5f0f2f238b376cf97f30.tar.zst freebsd-ports-gnome-d218b8d3acdacaea8bab5f0f2f238b376cf97f30.zip | |
Fix build error on 4-stable. [*]
Move macro definitions from extra-patch-config.h.in to patch-src:xine-engine:xine_internal.h.
Submitted by: glewis [*]
Diffstat (limited to 'multimedia/libxine')
| -rw-r--r-- | multimedia/libxine/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/libxine/files/extra-patch-config.h.in | 17 | ||||
| -rw-r--r-- | multimedia/libxine/files/patch-src:xine-engine:xine_internal.h | 41 |
3 files changed, 38 insertions, 25 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 6a0fee54bb4f..7cdc7ee0a2a4 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -52,11 +52,6 @@ MAN1= xine-config.1 .include <bsd.port.pre.mk> -# PRId64, INT16_MAX macro are not defined -.if ${OSVERSION} < 500040 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-config.h.in -.endif - # CDIOCREADAUDIO macro is not defined .if ${OSVERSION} >= 501106 EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src:input:input_cdda.c diff --git a/multimedia/libxine/files/extra-patch-config.h.in b/multimedia/libxine/files/extra-patch-config.h.in deleted file mode 100644 index ce828973cc16..000000000000 --- a/multimedia/libxine/files/extra-patch-config.h.in +++ /dev/null @@ -1,17 +0,0 @@ ---- config.h.in.orig Mon Jun 21 09:24:55 2004 -+++ config.h.in Sun Jul 4 02:25:58 2004 -@@ -561,3 +561,14 @@ - - /* Define to `unsigned' if <sys/types.h> does not define. */ - #undef size_t -+ -+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__\ -+sparc64__) -+#define PRId64 "ld" -+#else if defined(__i386__) || defined(__powerpc__) -+#define PRId64 "lld" -+#endif -+#define INT16_MAX 0x7fff -+#define INT16_MIN (-0x7fff-1) -+#define INT32_MAX 0x7fffffff -+#define INT32_MIN (-0x7fffffff-1) diff --git a/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h b/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h index 40c70a7dc86f..88f8ce9033a7 100644 --- a/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h +++ b/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h @@ -1,6 +1,6 @@ ---- src/xine-engine/xine_internal.h.orig Thu Dec 30 11:02:18 2004 -+++ src/xine-engine/xine_internal.h Thu Dec 30 11:20:56 2004 -@@ -70,6 +70,42 @@ +--- 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> #endif @@ -12,11 +12,39 @@ +#define INT8_MAX 0x7f +#endif + ++#ifndef INT16_MAX ++#define INT16_MAX 0x7fff ++#endif ++ ++#ifndef INT16_MIN ++#define INT16_MIN (-0x7fff-1) ++#endif ++ ++#ifndef INT32_MAX ++#define INT32_MAX 0x7fffffff ++#endif ++ ++#ifndef INT32_MIN ++#define INT32_MIN (-0x7fffffff-1) ++#endif ++ +#ifndef PRIiMAX +#define PRIiMAX "lld" +typedef long long intmax_t; +#endif + ++#ifndef PRId64 ++#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__) ++#define PRId64 "ld" ++#else if defined(__i386__) || defined(__powerpc__) ++#define PRId64 "lld" ++#endif ++#endif ++ ++#ifndef PRIdMAX ++#define PRIdMAX "lld" ++#endif ++ +#ifndef SCNdMAX +#define SCNdMAX "lld" +#endif @@ -37,9 +65,16 @@ +#define PRIXMAX "llX" +#endif + ++#ifndef PRIxMAX ++#define PRIxMAX "llx" ++#endif ++ +#ifndef UINT64_C +#define UINT64_C(c) (c ## ULL) +#endif ++ ++ ++ #define XINE_MAX_EVENT_LISTENERS 50 #define XINE_MAX_EVENT_TYPES 100 |