diff options
Diffstat (limited to 'multimedia/mlt/patches')
-rw-r--r-- | multimedia/mlt/patches/patch-aa | 29 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ab | 14 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ac | 14 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ad | 14 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ae | 14 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-af | 41 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ag | 15 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ah | 14 | ||||
-rw-r--r-- | multimedia/mlt/patches/patch-ai | 14 |
9 files changed, 169 insertions, 0 deletions
diff --git a/multimedia/mlt/patches/patch-aa b/multimedia/mlt/patches/patch-aa new file mode 100644 index 00000000000..c008e09ed79 --- /dev/null +++ b/multimedia/mlt/patches/patch-aa @@ -0,0 +1,29 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add support for NetBSD - copy of FreeBSD except for uname -m amd64 vs x86_64 + +--- configure.orig 2010-09-14 06:00:09.000000000 +0000 ++++ configure +@@ -97,6 +97,14 @@ build_config() + echo "RDYNAMIC=-rdynamic" + echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed" + ;; ++ NetBSD) ++ [ "$(uname -m)" = "amd64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64" ++ echo "OPTIMISATIONS+=-ffast-math" ++ echo "CFLAGS+=-pthread" ++ echo "SHFLAGS=-shared" ++ echo "RDYNAMIC=-rdynamic" ++ echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed" ++ ;; + *) + ;; + esac +@@ -171,7 +179,7 @@ case $targetos in + Darwin) + LIBSUF=".dylib" + ;; +- Linux|FreeBSD) ++ Linux|FreeBSD|NetBSD) + LIBSUF=".so" + ;; + *) diff --git a/multimedia/mlt/patches/patch-ab b/multimedia/mlt/patches/patch-ab new file mode 100644 index 00000000000..d17b0cd4ca1 --- /dev/null +++ b/multimedia/mlt/patches/patch-ab @@ -0,0 +1,14 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add support for NetBSD - match FreeBSD + +--- src/mlt++/configure.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/mlt++/configure +@@ -11,7 +11,7 @@ case $targetos in + echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC" + echo "LIBFLAGS=-dynamiclib -single_module" + ;; +- Linux|FreeBSD) ++ Linux|FreeBSD|NetBSD) + echo LIBSUF=.so + echo "CXXFLAGS+=-Wall $WARNINGS -fPIC -DPIC" + echo "LIBFLAGS=-shared" diff --git a/multimedia/mlt/patches/patch-ac b/multimedia/mlt/patches/patch-ac new file mode 100644 index 00000000000..fc2c47ecfe7 --- /dev/null +++ b/multimedia/mlt/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add support for NetBSD - match FreeBSD + +--- src/modules/avformat/configure.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/avformat/configure +@@ -34,7 +34,7 @@ else + Darwin) + export LIBSUF=.dylib + ;; +- Linux|FreeBSD) ++ Linux|FreeBSD|NetBSD) + export LIBSUF=.so + ;; + *) diff --git a/multimedia/mlt/patches/patch-ad b/multimedia/mlt/patches/patch-ad new file mode 100644 index 00000000000..d16762f18bb --- /dev/null +++ b/multimedia/mlt/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add support for NetBSD - match FreeBSD + +--- src/modules/qimage/configure.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/qimage/configure +@@ -24,7 +24,7 @@ else + Darwin) + export LIBSUF=.dylib + ;; +- Linux|FreeBSD) ++ Linux|FreeBSD|NetBSD) + export LIBSUF=.so + ;; + *) diff --git a/multimedia/mlt/patches/patch-ae b/multimedia/mlt/patches/patch-ae new file mode 100644 index 00000000000..1dde4e1277b --- /dev/null +++ b/multimedia/mlt/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add support for NetBSD - match FreeBSD + +--- src/modules/sox/configure.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/sox/configure +@@ -8,7 +8,7 @@ then + Darwin) + LDD="otool -L" + ;; +- Linux|FreeBSD) ++ Linux|FreeBSD|NetBSD) + LDD="ldd" + ;; + *) diff --git a/multimedia/mlt/patches/patch-af b/multimedia/mlt/patches/patch-af new file mode 100644 index 00000000000..f1d0f9bd82c --- /dev/null +++ b/multimedia/mlt/patches/patch-af @@ -0,0 +1,41 @@ +$NetBSD: patch-af,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Add NetBSD support (same as FreeBSD) and clean up *BSD ifdefs + +--- src/modules/kino/endian_types.h.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/kino/endian_types.h +@@ -28,30 +28,26 @@ + #define _ENDIAN_TYPES_H + + /* Needed for BYTE_ORDER and BIG/LITTLE_ENDIAN macros. */ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + #ifndef _BSD_SOURCE + # define _BSD_SOURCE +-#ifndef __FreeBSD__ + # include <endian.h> +-#else +-# include <sys/endian.h> +-#endif /* __FreeBSD__ */ + # undef _BSD_SOURCE + #else +-#ifndef __FreeBSD__ + # include <endian.h> ++#endif + #else + # include <sys/endian.h> +-#endif /* __FreeBSD__ */ +-#endif ++#endif /* !defined(__FreeBSD__) && !defined(__NetBSD__) */ + + #include <sys/types.h> +-#ifndef __FreeBSD__ ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + #include <byteswap.h> + #else + #define bswap_16(x) bswap16(x) + #define bswap_32(x) bswap32(x) + #define bswap_64(x) bswap64(x) +-#endif /* __FreeBSD__ */ ++#endif /* !defined(__FreeBSD__) && !defined(__NetBSD__) */ + + static inline int8_t bswap(const int8_t& x) + { diff --git a/multimedia/mlt/patches/patch-ag b/multimedia/mlt/patches/patch-ag new file mode 100644 index 00000000000..1438ceb4b62 --- /dev/null +++ b/multimedia/mlt/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Remove unnecessary byteswap.h as we later include riff.h which includes byteswap.h as needed + +--- src/modules/kino/riff.cc.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/kino/riff.cc +@@ -25,9 +25,6 @@ + //#include <stdio.h> + #include <iostream> + #include <iomanip> +-#ifndef __FreeBSD__ +-#include <byteswap.h> +-#endif /* __FreeBSD__ */ + + using std::cout; + using std::hex; diff --git a/multimedia/mlt/patches/patch-ah b/multimedia/mlt/patches/patch-ah new file mode 100644 index 00000000000..d25941c7f03 --- /dev/null +++ b/multimedia/mlt/patches/patch-ah @@ -0,0 +1,14 @@ +$NetBSD: patch-ah,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Use CXX rather than CC to link c++, to ensure correct handling on more platforms + +--- src/modules/kino/Makefile.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/kino/Makefile +@@ -30,7 +30,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cc) + all: $(TARGET) + + $(TARGET): $(OBJS) $(CPPOBJS) +- $(CC) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS) ++ $(CXX) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS) + + depend: $(SRCS) + $(CC) -MM $(CFLAGS) $^ 1>.depend diff --git a/multimedia/mlt/patches/patch-ai b/multimedia/mlt/patches/patch-ai new file mode 100644 index 00000000000..321c7644493 --- /dev/null +++ b/multimedia/mlt/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1.1.1 2010/10/19 16:37:40 abs Exp $ +# Use CXX rather than CC to link c++, to ensure correct handling on more platforms + +--- src/modules/qimage/Makefile.orig 2010-09-14 06:00:09.000000000 +0000 ++++ src/modules/qimage/Makefile +@@ -24,7 +24,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp) + all: $(TARGET) + + $(TARGET): $(OBJS) $(CPPOBJS) +- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS) ++ $(CXX) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS) + + depend: $(SRCS) + $(CC) -MM $(CFLAGS) $(QTCXXFLAGS) $^ 1>.depend |