summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-06-24 12:03:41 +0000
committerwiz <wiz@pkgsrc.org>2014-06-24 12:03:41 +0000
commitd7440c023dab70f49dac0b3065de93a0a56b9586 (patch)
tree0978b11b80daf9427b03068c7cba30bb673af656
parentb111b34f0540a3c080ef536f1ea332ea58e80d05 (diff)
downloadpkgsrc-d7440c023dab70f49dac0b3065de93a0a56b9586.tar.gz
Fix build of mplayer packages on Mac OS X Mavericks.
Patch provided by Jan Danielsson on pkgsrc-users. Also addresses PR 48943 by Youri Mouton.
-rw-r--r--multimedia/gmplayer/distinfo3
-rw-r--r--multimedia/mplayer-share/distinfo3
-rw-r--r--multimedia/mplayer-share/patches/patch-libvo_vo__corevideo.h17
3 files changed, 21 insertions, 2 deletions
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index ba46c744d35..abc3bebcd01 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2014/05/21 20:34:38 wiz Exp $
+$NetBSD: distinfo,v 1.85 2014/06/24 12:03:41 wiz Exp $
SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -68,6 +68,7 @@ SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
+SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 07db8252b01..766caa51f48 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2014/05/16 09:49:06 wiz Exp $
+$NetBSD: distinfo,v 1.83 2014/06/24 12:03:42 wiz Exp $
SHA1 (mplayer/MPlayer-1.1.1.tar.xz) = ba2f3bd1442d04b17b0143680850273d928689c1
RMD160 (mplayer/MPlayer-1.1.1.tar.xz) = 745b3fdf684ba7614dbec2a7143188b7c9cca3a1
@@ -8,6 +8,7 @@ SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
+SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
SHA1 (patch-libvo_vo__gif89a.c) = 88e20df5ea5d5f294d312dddab08cb0e40fb8483
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
diff --git a/multimedia/mplayer-share/patches/patch-libvo_vo__corevideo.h b/multimedia/mplayer-share/patches/patch-libvo_vo__corevideo.h
new file mode 100644
index 00000000000..994d78b354c
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-libvo_vo__corevideo.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-libvo_vo__corevideo.h,v 1.1 2014/06/24 12:03:42 wiz Exp $
+
+Apparently Apple have moved things around. Explicitly include the GL headers
+for Mavericks SDK.
+
+--- libvo/vo_corevideo.h.orig 2014-06-24 11:24:53.000000000 +0000
++++ libvo/vo_corevideo.h
+@@ -26,6 +26,9 @@
+ #import <Cocoa/Cocoa.h>
+ #import <QuartzCore/QuartzCore.h>
+ #import <Carbon/Carbon.h>
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
++#import <OpenGL/gl.h>
++#endif
+
+ // MPlayer OS X VO Protocol
+ @protocol MPlayerOSXVOProto