diff options
author | jmcneill <jmcneill@pkgsrc.org> | 2009-01-21 14:15:15 +0000 |
---|---|---|
committer | jmcneill <jmcneill@pkgsrc.org> | 2009-01-21 14:15:15 +0000 |
commit | 684be9f2d46c5b8d31b8198cb5cfee21df18e089 (patch) | |
tree | d5624799a32e0c8881217ec07f1126f35d05ffc0 /multimedia/handbrake/patches | |
parent | 67fce398e525243ff52482ebfdd4b675f8558f63 (diff) | |
download | pkgsrc-684be9f2d46c5b8d31b8198cb5cfee21df18e089.tar.gz |
Import handbrake version 0.9.3.
HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
transcoder, available for MacOS X, NetBSD, Linux and Windows.
Supported sources:
* Any DVD-like source: VIDEO_TS folder, DVD image or real DVD
(unencrypted--protection methods including CSS are not supported internally
and must be handled externally with third-party software and libraries),
and some .VOB and .TS files
* Most any multimedia file it can get libavformat to read and libavcodec to
decode.
Outputs:
* File format: MP4, MKV, AVI or OGM
* Video: MPEG-4, H.264, or Theora (1 or 2 passes or constant quantizer/rate
encoding)
* Audio: AAC, MP3, Vorbis or AC-3 pass-through (supports encoding of several
audio tracks)
Misc features:
* Chapter selection
* Basic subtitle support (burned into the picture)
* Integrated bitrate calculator
* Picture deinterlacing, cropping and scaling
* Grayscale encoding
Diffstat (limited to 'multimedia/handbrake/patches')
-rw-r--r-- | multimedia/handbrake/patches/patch-aa | 29 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ab | 36 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ac | 33 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ad | 23 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ae | 13 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-af | 38 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ag | 13 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ah | 16 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-ai | 49 | ||||
-rw-r--r-- | multimedia/handbrake/patches/patch-aj | 38 |
10 files changed, 288 insertions, 0 deletions
diff --git a/multimedia/handbrake/patches/patch-aa b/multimedia/handbrake/patches/patch-aa new file mode 100644 index 00000000000..58e5abd71a2 --- /dev/null +++ b/multimedia/handbrake/patches/patch-aa @@ -0,0 +1,29 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- Makefile.orig 2008-11-21 15:54:03.000000000 -0500 ++++ Makefile +@@ -1,6 +1,12 @@ + include Makefile.config + + SYSTEM = $(shell uname -s) ++ifeq ($(SYSTEM),Linux) ++ SYSTEM = UNIX ++endif ++ifeq ($(SYSTEM),NetBSD) ++ SYSTEM = UNIX ++endif + + # Special case for Mac OS X: everything is handled from the Xcode project + +@@ -65,9 +71,9 @@ cli-snapshot-release: + endif + + # +-# Linux ++# UNIX + # +-ifeq ($(SYSTEM),Linux) ++ifeq ($(SYSTEM),UNIX) + + snapshot: unstable-libhb/hbversion.h all + diff --git a/multimedia/handbrake/patches/patch-ab b/multimedia/handbrake/patches/patch-ab new file mode 100644 index 00000000000..b6aa5f2d235 --- /dev/null +++ b/multimedia/handbrake/patches/patch-ab @@ -0,0 +1,36 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- contrib/Makefile.orig 2008-06-17 18:32:05.000000000 -0400 ++++ contrib/Makefile +@@ -1,6 +1,13 @@ + # Contrib Makefile + + SYSTEM = $(shell uname -s) ++ifeq ($(SYSTEM),Linux) ++ SYSTEM = UNIX ++endif ++ifeq ($(SYSTEM),NetBSD) ++ 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) + all: .contrib + + .contrib: +- ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; ../jam ) ++ ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; ../jam -q ) + + clean: + ( echo "Do a make mrproper to remove the contrib libraries ) +@@ -18,7 +25,7 @@ mrproper: + + endif + +-ifeq ($(SYSTEM),Linux) ++ifeq ($(SYSTEM),UNIX) + + all: .contrib + diff --git a/multimedia/handbrake/patches/patch-ac b/multimedia/handbrake/patches/patch-ac new file mode 100644 index 00000000000..64f11c43661 --- /dev/null +++ b/multimedia/handbrake/patches/patch-ac @@ -0,0 +1,33 @@ +$NetBSD: patch-ac,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- configure.orig 2008-09-30 15:17:10.000000000 -0400 ++++ configure +@@ -5,7 +5,7 @@ CXX="g++" + CCFLAGS="$CCFLAGS -Wall -g" + OPTIM="$OPTIM -O3 -funroll-loops" + LINKLIBS="-lz -lbz2" +-MAKE=make ++MAKE=gmake + + # System-specific flags + SYSTEM=`uname -s` +@@ -85,19 +85,6 @@ else + fi + rm -f testconf.c testconf + +-# +-# Use Gnu make when available over the built in make +-# +-if ( make --version | grep GNU ) > /dev/null 2>&1 +-then +-MAKE=make +-elif ( gmake --version | grep GNU ) > /dev/null 2>&1 +-then +-MAKE=gmake +-else +-MAKE=make +-fi +- + # Unless the user wants a release build, configure for SVN snapshots + if test "$1" = "--release" || test "$2" = "--release"; then + SNAPSHOT=0 diff --git a/multimedia/handbrake/patches/patch-ad b/multimedia/handbrake/patches/patch-ad new file mode 100644 index 00000000000..2179e84e9fe --- /dev/null +++ b/multimedia/handbrake/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- contrib/Jamfile.orig 2008-10-27 19:29:19.000000000 -0400 ++++ contrib/Jamfile +@@ -80,6 +80,7 @@ rule LibAvCodec + FFMPEG_PATCH = "$(PATCH) -p0 < ../patch-ffmpeg.patch" ; + FFMPEG_PATCH += " && $(PATCH) -p0 < ../patch-ffmpeg-latm.patch " ; + FFMPEG_PATCH += " && $(PATCH) -p0 < ../patch-ffmpeg-mpegleak.patch " ; ++ FFMPEG_PATCH += " && $(PATCH) -p0 < ../patch-ffmpeg-nodocs.patch " ; + if $(OS) = CYGWIN + { + FFMPEG_PATCH += " && $(PATCH) -p1 < ../patch-ffmpeg-cygwin.patch " ; +@@ -98,6 +99,10 @@ rule LibAvCodec + # + FFMPEG_EXTRA_OPTIONS = "--disable-vis --disable-demuxer=mpc8 --disable-vhook --disable-network" ; + } ++ else ++ { ++ FFMPEG_EXTRA_OPTIONS = "--enable-memalign-hack --disable-devices" ; ++ } + + Depends $(<) : $(>) ; + Depends lib : $(<) ; diff --git a/multimedia/handbrake/patches/patch-ae b/multimedia/handbrake/patches/patch-ae new file mode 100644 index 00000000000..779091e24b7 --- /dev/null +++ b/multimedia/handbrake/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- libhb/fifo.c.orig 2009-01-20 20:53:21.000000000 -0500 ++++ libhb/fifo.c +@@ -147,7 +147,7 @@ hb_buffer_t * hb_buffer_init( int size ) + + if (size) + { +-#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) ++#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined( SYS_NETBSD ) + b->data = malloc( b->alloc ); + #elif defined( SYS_CYGWIN ) + /* FIXME */ diff --git a/multimedia/handbrake/patches/patch-af b/multimedia/handbrake/patches/patch-af new file mode 100644 index 00000000000..c413d2c3730 --- /dev/null +++ b/multimedia/handbrake/patches/patch-af @@ -0,0 +1,38 @@ +$NetBSD: patch-af,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- libhb/ports.c.orig 2008-10-09 20:41:15.000000000 -0400 ++++ libhb/ports.c 2009-01-21 08:57:58.000000000 -0500 +@@ -16,6 +16,11 @@ + #include <sys/processor.h> + #endif + ++#if defined( SYS_NETBSD ) ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#endif ++ + #if USE_PTHREAD + #include <pthread.h> + #endif +@@ -76,7 +81,7 @@ void hb_snooze( int delay ) + } + #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 ) + usleep( 1000 * delay ); + #elif defined( SYS_CYGWIN ) + Sleep( delay ); +@@ -124,6 +129,12 @@ int hb_get_cpu_count() + fclose( info ); + } + ++#elif defined( SYS_NETBSD ) ++ size_t oldlen = sizeof( cpu_count ); ++ ++ if ( sysctlbyname( "hw.ncpu", &cpu_count, &oldlen, NULL, 0 ) != 0 ) ++ cpu_count = 1; ++ + #elif defined( SYS_LINUX ) + { + FILE * info; diff --git a/multimedia/handbrake/patches/patch-ag b/multimedia/handbrake/patches/patch-ag new file mode 100644 index 00000000000..c528576bb30 --- /dev/null +++ b/multimedia/handbrake/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- libhb/ports.h.orig 2009-01-20 20:52:23.000000000 -0500 ++++ libhb/ports.h +@@ -37,7 +37,7 @@ typedef struct hb_thread_s hb_thread_t; + #elif defined( SYS_DARWIN ) + # 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 ) + # define HB_LOW_PRIORITY 0 + # define HB_NORMAL_PRIORITY 0 + #elif defined( SYS_CYGWIN ) diff --git a/multimedia/handbrake/patches/patch-ah b/multimedia/handbrake/patches/patch-ah new file mode 100644 index 00000000000..e2f06c74989 --- /dev/null +++ b/multimedia/handbrake/patches/patch-ah @@ -0,0 +1,16 @@ +$NetBSD: patch-ah,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- test/Makefile.orig 2009-01-20 21:27:22.000000000 -0500 ++++ test/Makefile 2009-01-20 21:27:40.000000000 -0500 +@@ -15,7 +15,11 @@ ifeq ($(findstring CYGWIN_NT,$(SYSTEM)), + LIBS2 += $(CYGLIBS:%=../contrib/lib/libz.a) $(CYGLIBS:%=../contrib/lib/libbz2.a) + endif + ++ifeq ($(SYSTEM),NetBSD) ++LDFLAGS += $(LIBS2) -lbz2 ++else + LDFLAGS += $(LIBS2) -lbz2 -ldl ++endif + + ../HandBrakeCLI: test.c parsecsv.c $(LIBS2) + @CMD="$(CC) $(CFLAGS) -o test.o -c test.c"; $$CMD || \ diff --git a/multimedia/handbrake/patches/patch-ai b/multimedia/handbrake/patches/patch-ai new file mode 100644 index 00000000000..d90bb6bc3da --- /dev/null +++ b/multimedia/handbrake/patches/patch-ai @@ -0,0 +1,49 @@ +$NetBSD: patch-ai,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- gtk/src/main.c.orig 2009-01-20 21:29:05.000000000 -0500 ++++ gtk/src/main.c 2009-01-20 21:39:06.000000000 -0500 +@@ -429,8 +429,13 @@ IoRedirect(signal_user_data_t *ud) + g_free(config); + // Set encoding to raw. + g_io_channel_set_encoding (ud->activity_log, NULL, NULL); ++#ifdef __NetBSD__ ++ stderr->_file = pfd[1]; ++ stdin->_file = pfd[0]; ++#else + stderr->_fileno = pfd[1]; + stdin->_fileno = pfd[0]; ++#endif + channel = g_io_channel_unix_new (pfd[0]); + // I was getting an this error: + // "Invalid byte sequence in conversion input" +@@ -457,7 +462,6 @@ static GOptionEntry entries[] = + { NULL } + }; + +-#if defined(__linux__) + void drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud); + //void drive_disconnected_cb(GnomeVFSVolumeMonitor *gvm, GnomeVFSDrive *gd, signal_user_data_t *ud); + +@@ -470,12 +474,6 @@ watch_volumes(signal_user_data_t *ud) + g_signal_connect(gvm, "drive-changed", (GCallback)drive_changed_cb, ud); + //g_signal_connect(gvm, "drive-connected", (GCallback)drive_connected_cb, ud); + } +-#else +-void +-watch_volumes(signal_user_data_t *ud) +-{ +-} +-#endif + + // Hack to avoid a segfault in libavcodec + extern int mm_flags; +@@ -511,9 +509,7 @@ main (int argc, char *argv[]) + ghb_resource_init(); + ghb_load_icons(); + +-#if defined(__linux__) + ghb_hal_init(); +-#endif + + ud = g_malloc0(sizeof(signal_user_data_t)); + ud->debug = ghb_debug; diff --git a/multimedia/handbrake/patches/patch-aj b/multimedia/handbrake/patches/patch-aj new file mode 100644 index 00000000000..2f437434757 --- /dev/null +++ b/multimedia/handbrake/patches/patch-aj @@ -0,0 +1,38 @@ +$NetBSD: patch-aj,v 1.1.1.1 2009/01/21 14:15:15 jmcneill Exp $ + +--- gtk/src/ghb-dvd.c.orig 2009-01-20 21:34:27.000000000 -0500 ++++ gtk/src/ghb-dvd.c 2009-01-20 21:34:56.000000000 -0500 +@@ -315,7 +315,6 @@ ghb_dvd_volname(const gchar *device) + } + #endif + +-#if defined(__linux__) + gchar* + ghb_resolve_symlink(const gchar *name) + { +@@ -359,12 +358,10 @@ ghb_resolve_symlink(const gchar *name) + g_object_unref(gfile); + return file; + } +-#endif + + void + ghb_dvd_set_current(const gchar *name, signal_user_data_t *ud) + { +-#if defined(__linux__) + GFile *gfile; + GFileInfo *info; + gchar *resolved = ghb_resolve_symlink(name); +@@ -394,12 +391,4 @@ ghb_dvd_set_current(const gchar *name, s + g_free(resolved); + } + g_object_unref(gfile); +-#else +- if (ud->current_dvd_device != NULL) +- { +- g_free(ud->current_dvd_device); +- ud->current_dvd_device = NULL; +- } +- ud->current_dvd_device = g_strdup(name);; +-#endif + } |