summaryrefslogtreecommitdiff
path: root/multimedia/handbrake/patches
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/handbrake/patches')
-rw-r--r--multimedia/handbrake/patches/patch-aa9
-rw-r--r--multimedia/handbrake/patches/patch-ab11
-rw-r--r--multimedia/handbrake/patches/patch-ac20
-rw-r--r--multimedia/handbrake/patches/patch-ae4
-rw-r--r--multimedia/handbrake/patches/patch-af8
-rw-r--r--multimedia/handbrake/patches/patch-ag4
6 files changed, 37 insertions, 19 deletions
diff --git a/multimedia/handbrake/patches/patch-aa b/multimedia/handbrake/patches/patch-aa
index 58e5abd71a2..b502c2e7b06 100644
--- a/multimedia/handbrake/patches/patch-aa
+++ b/multimedia/handbrake/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2009/04/28 11:57:54 hasso Exp $
--- Makefile.orig 2008-11-21 15:54:03.000000000 -0500
+++ Makefile
-@@ -1,6 +1,12 @@
+@@ -1,6 +1,15 @@
include Makefile.config
SYSTEM = $(shell uname -s)
@@ -12,10 +12,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+ifeq ($(SYSTEM),NetBSD)
+ SYSTEM = UNIX
+endif
++ifeq ($(SYSTEM),DragonFly)
++ SYSTEM = UNIX
++endif
# Special case for Mac OS X: everything is handled from the Xcode project
-@@ -65,9 +71,9 @@ cli-snapshot-release:
+@@ -68,9 +74,9 @@ cli-snapshot-release:
endif
#
diff --git a/multimedia/handbrake/patches/patch-ab b/multimedia/handbrake/patches/patch-ab
index b6aa5f2d235..9f46576b582 100644
--- a/multimedia/handbrake/patches/patch-ab
+++ b/multimedia/handbrake/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-ab,v 1.2 2009/04/28 11:57:54 hasso Exp $
--- contrib/Makefile.orig 2008-06-17 18:32:05.000000000 -0400
+++ contrib/Makefile
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,16 @@
# Contrib Makefile
SYSTEM = $(shell uname -s)
@@ -12,11 +12,14 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+ifeq ($(SYSTEM),NetBSD)
+ SYSTEM = UNIX
+endif
++ifeq ($(SYSTEM),DragonFly)
++ SYSTEM = UNIX
++endif
+
# Special case for Mac OS X: everything is handled from the Xcode project
ifeq ($(SYSTEM),Darwin)
-@@ -8,7 +15,7 @@ ifeq ($(SYSTEM),Darwin)
+@@ -11,7 +18,7 @@ ifeq ($(SYSTEM),Darwin)
all: .contrib
.contrib:
@@ -25,7 +28,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
clean:
( echo "Do a make mrproper to remove the contrib libraries )
-@@ -18,7 +25,7 @@ mrproper:
+@@ -21,7 +28,7 @@ mrproper:
endif
diff --git a/multimedia/handbrake/patches/patch-ac b/multimedia/handbrake/patches/patch-ac
index 64f11c43661..c3cf2ceceb0 100644
--- a/multimedia/handbrake/patches/patch-ac
+++ b/multimedia/handbrake/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2009/04/28 11:57:55 hasso Exp $
---- configure.orig 2008-09-30 15:17:10.000000000 -0400
-+++ configure
+--- configure.orig 2008-09-30 22:17:10 +0300
++++ configure 2009-03-22 03:12:13 +0200
@@ -5,7 +5,7 @@ CXX="g++"
CCFLAGS="$CCFLAGS -Wall -g"
OPTIM="$OPTIM -O3 -funroll-loops"
@@ -11,7 +11,19 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
# System-specific flags
SYSTEM=`uname -s`
-@@ -85,19 +85,6 @@ else
+@@ -46,6 +46,11 @@ case $SYSTEM in
+ DEFINES="$DEFINES SYS_NETBSD USE_PTHREAD"
+ LINKLIBS="$LINKLIBS -lpthread"
+ ;;
++
++ DragonFly)
++ DEFINES="$DEFINES SYS_DRAGONFLY USE_PTHREAD"
++ LINKLIBS="$LINKLIBS -lpthread"
++ ;;
+
+ Linux)
+ DEFINES="$DEFINES SYS_LINUX USE_PTHREAD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64"
+@@ -85,19 +90,6 @@ else
fi
rm -f testconf.c testconf
diff --git a/multimedia/handbrake/patches/patch-ae b/multimedia/handbrake/patches/patch-ae
index 779091e24b7..d1ac67d211d 100644
--- a/multimedia/handbrake/patches/patch-ae
+++ b/multimedia/handbrake/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-ae,v 1.2 2009/04/28 11:57:55 hasso Exp $
--- libhb/fifo.c.orig 2009-01-20 20:53:21.000000000 -0500
+++ libhb/fifo.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
if (size)
{
-#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_NETBSD )
++#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_NETBSD ) || defined( SYS_DRAGONFLY )
b->data = malloc( b->alloc );
#elif defined( SYS_CYGWIN )
/* FIXME */
diff --git a/multimedia/handbrake/patches/patch-af b/multimedia/handbrake/patches/patch-af
index c413d2c3730..2ca5858e1c5 100644
--- a/multimedia/handbrake/patches/patch-af
+++ b/multimedia/handbrake/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-af,v 1.2 2009/04/28 11:57:55 hasso Exp $
--- libhb/ports.c.orig 2008-10-09 20:41:15.000000000 -0400
+++ libhb/ports.c 2009-01-21 08:57:58.000000000 -0500
@@ -6,7 +6,7 @@ $NetBSD: patch-af,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
#include <sys/processor.h>
#endif
-+#if defined( SYS_NETBSD )
++#if defined( SYS_NETBSD ) || defined( SYS_DRAGONFLY )
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#endif
@@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
#if defined( SYS_BEOS )
snooze( 1000 * delay );
-#elif defined( SYS_DARWIN ) || defined( SYS_LINUX ) || defined( SYS_FREEBSD) || defined( SYS_SunOS )
-+#elif defined( SYS_DARWIN ) || defined( SYS_LINUX ) || defined( SYS_FREEBSD) || defined( SYS_SunOS ) || defined( SYS_NETBSD )
++#elif defined( SYS_DARWIN ) || defined( SYS_LINUX ) || defined( SYS_FREEBSD) || defined( SYS_SunOS ) || defined( SYS_NETBSD ) || defined( SYS_DRAGONFLY )
usleep( 1000 * delay );
#elif defined( SYS_CYGWIN )
Sleep( delay );
@@ -27,7 +27,7 @@ $NetBSD: patch-af,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
fclose( info );
}
-+#elif defined( SYS_NETBSD )
++#elif defined( SYS_NETBSD ) || defined( SYS_DRAGONFLY )
+ size_t oldlen = sizeof( cpu_count );
+
+ if ( sysctlbyname( "hw.ncpu", &cpu_count, &oldlen, NULL, 0 ) != 0 )
diff --git a/multimedia/handbrake/patches/patch-ag b/multimedia/handbrake/patches/patch-ag
index c528576bb30..1245fd6f99d 100644
--- a/multimedia/handbrake/patches/patch-ag
+++ b/multimedia/handbrake/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
+$NetBSD: patch-ag,v 1.2 2009/04/28 11:57:55 hasso Exp $
--- libhb/ports.h.orig 2009-01-20 20:52:23.000000000 -0500
+++ libhb/ports.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $
# define HB_LOW_PRIORITY 0
# define HB_NORMAL_PRIORITY 31
-#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS )
-+#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined( SYS_NETBSD )
++#elif defined( SYS_LINUX ) || defined( SYS_FREEBSD ) || defined ( SYS_SunOS ) || defined( SYS_NETBSD ) || defined( SYS_DRAGONFLY )
# define HB_LOW_PRIORITY 0
# define HB_NORMAL_PRIORITY 0
#elif defined( SYS_CYGWIN )
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-07 22:20:13 +0000