From b4cedfb5cf5e7cd01de2438e978b6dc87653ce4b Mon Sep 17 00:00:00 2001
From: martin <martin@pkgsrc.org>
Date: Thu, 9 Oct 2014 14:48:51 +0000
Subject: Fix linking of gmplayer by providing a definition for a common
 "dvd_angle".

---
 multimedia/gmplayer/Makefile                           |  4 ++--
 multimedia/gmplayer/distinfo                           |  3 ++-
 multimedia/mplayer-share/Makefile                      |  4 ++--
 multimedia/mplayer-share/distinfo                      |  3 ++-
 multimedia/mplayer-share/patches/patch-gui_interface.c | 14 ++++++++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 multimedia/mplayer-share/patches/patch-gui_interface.c

(limited to 'multimedia')

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index bdf9c2b9281..bd5748bd68b 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2014/10/04 12:49:05 wiz Exp $
+# $NetBSD: Makefile,v 1.120 2014/10/09 14:48:51 martin Exp $
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
 # that *both* distinfo files contain the correct, up-to-date files and
@@ -8,7 +8,7 @@
 #
 
 PKGNAME=	gmplayer-${MPLAYER_VERSION}
-PKGREVISION=	19
+PKGREVISION=	20
 
 SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 		http://www2.mplayerhq.hu/MPlayer/skins/		\
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 4aa600e4a80..cd781f98668 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2014/07/29 15:25:19 wiz Exp $
+$NetBSD: distinfo,v 1.88 2014/10/09 14:48:51 martin Exp $
 
 SHA1 (mplayer/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
 RMD160 (mplayer/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
@@ -68,6 +68,7 @@ SHA1 (patch-aa) = da461823d0731624de964323ab630f6e295be7b7
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
+SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index 8f7082f7f0d..83f1e3c88b2 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2014/06/09 14:18:08 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2014/10/09 14:48:51 martin Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_VERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 COMMENT=	Documentation used by mplayer and gmplayer
 
 DEPENDS+=	mplayer-fonts-[0-9]*:../../fonts/mplayer-fonts
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 46228fcac42..8822fa08bc0 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.85 2014/06/27 15:58:44 drochner Exp $
+$NetBSD: distinfo,v 1.86 2014/10/09 14:48:51 martin 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-aa) = da461823d0731624de964323ab630f6e295be7b7
 SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = a1d16ce7a4ff5a2071a7bac1b6836dc197b849e4
 SHA1 (patch-ffmpeg_libavutil_x86__cpu.h) = ea2c6e179840c7746930848b751b6fd1dcd67e90
+SHA1 (patch-gui_interface.c) = 25ada9d9af1e76ffa7b4b97ee07fa1f5250ac000
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
 SHA1 (patch-libmpdemux_demux__gif.c) = 4efec4ea1fe395e24760530e532d3251c64a8fb8
 SHA1 (patch-libvo_vo__corevideo.h) = 2d0b1702363227363343a29060a7b027ce96b5bb
diff --git a/multimedia/mplayer-share/patches/patch-gui_interface.c b/multimedia/mplayer-share/patches/patch-gui_interface.c
new file mode 100644
index 00000000000..5afe010441a
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-gui_interface.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-gui_interface.c,v 1.1 2014/10/09 14:48:51 martin Exp $
+
+Add missing global variable to avoid link error.
+
+--- gui/interface.c.orig	2012-05-21 20:46:25.000000000 +0200
++++ gui/interface.c	2014-10-09 16:10:41.000000000 +0200
+@@ -62,6 +62,7 @@ guiInterface_t guiInfo = {
+ };
+ 
+ static int initialized;
++int dvd_angle = 1;
+ 
+ /* MPlayer -> GUI */
+ 
-- 
cgit v1.2.3