summaryrefslogtreecommitdiff
path: root/multimedia/libmp4v2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libmp4v2/patches')
-rw-r--r--multimedia/libmp4v2/patches/patch-aa22
-rw-r--r--multimedia/libmp4v2/patches/patch-ab13
-rw-r--r--multimedia/libmp4v2/patches/patch-ac17
-rw-r--r--multimedia/libmp4v2/patches/patch-ad22
-rw-r--r--multimedia/libmp4v2/patches/patch-ae14
-rw-r--r--multimedia/libmp4v2/patches/patch-af19
-rw-r--r--multimedia/libmp4v2/patches/patch-ag13
-rw-r--r--multimedia/libmp4v2/patches/patch-ah17
-rw-r--r--multimedia/libmp4v2/patches/patch-ai24
-rw-r--r--multimedia/libmp4v2/patches/patch-aj14
-rw-r--r--multimedia/libmp4v2/patches/patch-ak13
-rw-r--r--multimedia/libmp4v2/patches/patch-al20
12 files changed, 208 insertions, 0 deletions
diff --git a/multimedia/libmp4v2/patches/patch-aa b/multimedia/libmp4v2/patches/patch-aa
new file mode 100644
index 00000000000..d46be681ff1
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- bootstrap.orig 2005-08-12 17:17:17.000000000 +0000
++++ bootstrap
+@@ -34,7 +34,7 @@ if (test ! -f "$MPEG4IP_SRC/configure")
+ exit 1
+ fi
+
+-target_system=`uname -s`
++target_system=Linux
+ if sdl-config --version >/dev/null 2>/dev/null
+ then
+ echo "SDL appears to be installed"
+@@ -56,7 +56,7 @@ if test $target_system = "Linux"; then
+
+ if test $have_faac = "yes"; then
+ # we have lame and faac - see if faac is built with mp4 support
+- faac --help >&faac_help
++ faac --help >faac_help 2>&1
+ sdf=`grep "MP4 support unavailable" faac_help`
+ rm -f faac_help
+ if test -z "$sdf"; then
diff --git a/multimedia/libmp4v2/patches/patch-ab b/multimedia/libmp4v2/patches/patch-ab
new file mode 100644
index 00000000000..c4d4f2b1f08
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- configure.orig 2005-11-11 00:26:00.000000000 +0000
++++ configure
+@@ -1570,7 +1570,7 @@ echo "$as_me: error: Please run bootstra
+ { (exit 1); exit 1; }; }
+ exit -1
+ fi
+-rm -f config.h >&/dev/null
++rm -f config.h >/dev/null
+ touch config.h
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
diff --git a/multimedia/libmp4v2/patches/patch-ac b/multimedia/libmp4v2/patches/patch-ac
new file mode 100644
index 00000000000..11f6cd28c07
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- include/mpeg4ip_byteswap.h.orig 2006-04-28 09:17:18.000000000 +0000
++++ include/mpeg4ip_byteswap.h
+@@ -50,6 +50,12 @@
+ #define B2N_32(x) x = swap32(x)
+ #define B2N_64(x) x = swap64(x)
+
++#elif defined(__DragonFly__)
++#include <sys/endian.h>
++#define B2N_16(x) x = be16toh(x)
++#define B2N_32(x) x = be32toh(x)
++#define B2N_64(x) x = be64toh(x)
++
+ /* This is a slow but portable implementation, it has multiple evaluation
+ * problems so beware.
+ * FreeBSD and Solaris don't have <byteswap.h> or any other such
diff --git a/multimedia/libmp4v2/patches/patch-ad b/multimedia/libmp4v2/patches/patch-ad
new file mode 100644
index 00000000000..f9c64783901
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- lib/SDLAudio/configure.orig 2006-04-28 09:21:28.000000000 +0000
++++ lib/SDLAudio/configure
+@@ -23435,7 +23435,7 @@ fi;
+ # causes Carbon.p complaints?
+ # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+ ;;
+- *-*-freebsd*)
++ *-*-freebsd* | *-*-dragonfly*)
+ pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
+ pthread_lib="-pthread"
+ ;;
+@@ -24553,7 +24553,7 @@ case "$target" in
+ # Set up files for the thread library
+ # Set up files for the timer library
+ ;;
+- *-*-freebsd*)
++ *-*-freebsd* | *-*-dragonfly*)
+ ARCH=freebsd
+
+ CheckDiskAudio
diff --git a/multimedia/libmp4v2/patches/patch-ae b/multimedia/libmp4v2/patches/patch-ae
new file mode 100644
index 00000000000..c6aa63e5356
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- include/mpeg4ip.h.orig 2006-06-08 12:22:14.000000000 +0900
++++ include/mpeg4ip.h 2006-06-08 12:23:04.000000000 +0900
+@@ -233,7 +233,8 @@
+
+ #define ADV_SPACE(a) {while (isspace(*(a)) && (*(a) != '\0'))(a)++;}
+
+-#ifndef HAVE_GTK
++#ifndef __G_LIB_H__
++/* #ifndef HAVE_GTK */
+ typedef char gchar;
+ typedef unsigned char guchar;
+
diff --git a/multimedia/libmp4v2/patches/patch-af b/multimedia/libmp4v2/patches/patch-af
new file mode 100644
index 00000000000..1bb1fe5df70
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-af
@@ -0,0 +1,19 @@
+$NetBSD: patch-af,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+gcc4 does not like "static" external function declarations.
+
+--- lib/SDLAudio/src/audio/sun/SDL_sunaudio.c.orig 2004-02-24 21:36:07.000000000 +0100
++++ lib/SDLAudio/src/audio/sun/SDL_sunaudio.c 2006-06-16 09:16:42.000000000 +0200
+@@ -163,9 +163,11 @@ void DSP_WaitAudio(_THIS)
+ #endif
+ }
+
++static Uint8 snd2au(int sample);
++
+ void DSP_PlayAudio(_THIS)
+ {
+- static Uint8 snd2au(int sample);
++
+ /* Write the audio data */
+ if ( ulaw_only ) {
+ /* Assuming that this->spec.freq >= 8000 Hz */
diff --git a/multimedia/libmp4v2/patches/patch-ag b/multimedia/libmp4v2/patches/patch-ag
new file mode 100644
index 00000000000..80d82107f9c
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- common/video/iso-mpeg4/src/Makefile.in.orig 2006-07-22 21:14:45.000000000 +0200
++++ common/video/iso-mpeg4/src/Makefile.in 2006-07-22 21:14:54.000000000 +0200
+@@ -255,7 +255,7 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -Werror -D_OBSS_ @BILLS_CPPWARNINGS@
++AM_CXXFLAGS = -D__TRACE_AND_STATS_ -D__DOUBLE_PRECISION_ -D_REENTRANT -DNOCONTROLS -fexceptions -Wall -D_OBSS_ @BILLS_CPPWARNINGS@
+ INCLUDES = -I$(srcdir)/../include
+ lib_LTLIBRARIES = libmpeg4ip_mpeg4_iso.la
+ mp4vdec_SOURCES = \
diff --git a/multimedia/libmp4v2/patches/patch-ah b/multimedia/libmp4v2/patches/patch-ah
new file mode 100644
index 00000000000..1dfa9aea0e0
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+The MAX macro is not defined on all systems (e.g. solaris)
+
+--- lib/rtp/rtp.c.orig 2006-03-20 18:08:24.000000000 -0500
++++ lib/rtp/rtp.c
+@@ -61,6 +61,10 @@
+
+ #include "rtp.h"
+
++#ifndef MAX
++#define MAX(a,b) ((a) > (b) ? (a) : (b))
++#endif
++
+ typedef struct {
+ uint32_t key; /* Original allocation number */
+ uint32_t size; /* Size of allocation requested */
diff --git a/multimedia/libmp4v2/patches/patch-ai b/multimedia/libmp4v2/patches/patch-ai
new file mode 100644
index 00000000000..32e2f80f068
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ai
@@ -0,0 +1,24 @@
+$NetBSD: patch-ai,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+Tags: for-upstream
+
+--- doc/mp4v2/Makefile.am.orig 2003-02-06 20:15:04.000000000 +0100
++++ doc/mp4v2/Makefile.am 2007-01-05 18:20:54.000000000 +0100
+@@ -1,5 +1,4 @@
+-this_FILES = \
+- api.mpt \
++man_MANS = \
+ MP4.3 \
+ MP4AddAudioTrack.3 \
+ MP4AddHintTrack.3 \
+@@ -109,7 +108,6 @@ this_FILES = \
+ MP4WriteRtpHint.3 \
+ MP4WriteSample.3
+
+-
+-man_MANS = $(this_FILES)
+-
+-EXTRA_DIST = $(this_FILES)
++EXTRA_DIST = \
++ api.mpt \
++ $(this_FILES)
diff --git a/multimedia/libmp4v2/patches/patch-aj b/multimedia/libmp4v2/patches/patch-aj
new file mode 100644
index 00000000000..542e656d343
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+Tags: not-for-upstream
+
+--- doc/mp4v2/Makefile.in.orig 2007-01-05 18:21:23.000000000 +0100
++++ doc/mp4v2/Makefile.in 2007-01-05 18:21:29.000000000 +0100
+@@ -231,7 +231,6 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ this_FILES = \
+- api.mpt \
+ MP4.3 \
+ MP4AddAudioTrack.3 \
+ MP4AddHintTrack.3 \
diff --git a/multimedia/libmp4v2/patches/patch-ak b/multimedia/libmp4v2/patches/patch-ak
new file mode 100644
index 00000000000..7ee58cd7aad
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- lib/mp4v2/Makefile.in.orig 2007-02-09 13:03:33.000000000 +0100
++++ lib/mp4v2/Makefile.in
+@@ -284,7 +284,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = . test util
++#SUBDIRS = . test util
+ INCLUDES = -I$(top_srcdir)/include
+ AM_CXXFLAGS = @BILLS_CPPWARNINGS@
+ lib_LTLIBRARIES = libmp4v2.la
diff --git a/multimedia/libmp4v2/patches/patch-al b/multimedia/libmp4v2/patches/patch-al
new file mode 100644
index 00000000000..6df276ff7e5
--- /dev/null
+++ b/multimedia/libmp4v2/patches/patch-al
@@ -0,0 +1,20 @@
+$NetBSD: patch-al,v 1.1.1.1 2007/02/09 19:57:48 drochner Exp $
+
+--- lib/mp4v2/mp4.h.orig 2006-02-22 23:47:07.000000000 +0100
++++ lib/mp4v2/mp4.h
+@@ -31,8 +31,15 @@
+ #ifndef __MP4_INCLUDED__
+ #define __MP4_INCLUDED__
+
++#ifdef MPEG4IP
+ /* include system and project specific headers */
+ #include "mpeg4ip.h"
++#else
++#include <sys/types.h>
++#include <strings.h>
++#include <stdio.h>
++#include <stdbool.h>
++#endif
+
+ #include <math.h> /* to define float HUGE_VAL and/or NAN */
+ #ifndef NAN
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-22 09:31:12 +0000