diff options
| author | mm <mm@FreeBSD.org> | 2011-06-28 04:35:29 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-06-28 04:35:29 +0800 |
| commit | da65a3a9b2bb062014570a7001ca2b003553da2a (patch) | |
| tree | 42463fe67de4e906f321cf392181d134e97dbb32 /multimedia | |
| parent | ff4948ab4e9c3dd13dab336150d0b16ed4268eb6 (diff) | |
| download | freebsd-ports-graphics-da65a3a9b2bb062014570a7001ca2b003553da2a.tar.gz freebsd-ports-graphics-da65a3a9b2bb062014570a7001ca2b003553da2a.tar.zst freebsd-ports-graphics-da65a3a9b2bb062014570a7001ca2b003553da2a.zip | |
Unbreak by fixing patches
Reported by: pointyhat (pav)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-configure | 32 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c | 10 |
2 files changed, 12 insertions, 30 deletions
diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure index 94858426f80..db725c4297a 100644 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ b/multimedia/ffmpeg-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2011-03-21 19:36:45.000000000 +0100 -+++ configure 2011-03-22 08:01:47.676984034 +0100 -@@ -1629,7 +1629,7 @@ +--- configure.orig 2011-06-25 04:32:49.000000000 +0200 ++++ configure 2011-06-27 22:33:05.761413592 +0200 +@@ -1660,7 +1660,7 @@ nm_opts='-g' # machine @@ -9,25 +9,7 @@ cpu="generic" # OS -@@ -1675,7 +1675,7 @@ - - CC_O='-o $@' - --host_cflags='-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 -g -Wall' -+host_cflags='-D_ISOC99_SOURCE -O3 -g -Wall' - host_libs='-lm' - - target_path='$(CURDIR)' -@@ -2323,7 +2323,7 @@ - die "C compiler test failed." - fi - --add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -+add_cppflags -D_ISOC99_SOURCE - check_cflags -std=c99 - check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64 - #include <stdlib.h> -@@ -2917,9 +2917,9 @@ +@@ -2968,9 +2968,9 @@ texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html @@ -40,9 +22,9 @@ check_header sys/videoio.h check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" -@@ -3242,7 +3242,7 @@ - SRC_PATH_BARE=$source_path - BUILD_ROOT="$PWD" +@@ -3329,7 +3329,7 @@ + MANDIR=\$(DESTDIR)$mandir + SRC_PATH=$source_path CC_IDENT=$cc_ident -ARCH=$arch +FFMPEG_ARCH=$arch diff --git a/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c b/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c index 8ed9552eba7..83e42f8db40 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c +++ b/multimedia/ffmpeg-devel/files/patch-libavdevice-bktr.c @@ -1,5 +1,5 @@ ---- libavdevice/bktr.c.orig 2009-05-15 17:34:55.000000000 +0200 -+++ libavdevice/bktr.c 2009-05-15 17:38:01.000000000 +0200 +--- libavdevice/bktr.c.orig 2011-06-25 04:32:49.000000000 +0200 ++++ libavdevice/bktr.c 2011-06-25 10:11:19.281738648 +0200 @@ -24,6 +24,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -9,6 +9,6 @@ +typedef unsigned int u_int; +typedef unsigned long u_long; + - #define _BSD_SOURCE 1 - #include "libavformat/avformat.h" - #if HAVE_DEV_BKTR_IOCTL_METEOR_H && HAVE_DEV_BKTR_IOCTL_BT848_H + #include "libavutil/log.h" + #include "libavutil/opt.h" + #include "libavutil/parseutils.h" |