Fix libtool handling of ObjC.

4 files changed, 34 insertions, 1 deletions

diff --git a/multimedia/xine-lib/PLIST.Darwin b/multimedia/xine-lib/PLIST.Darwin
new file mode 100644
index 00000000000..3af108f794c
--- /dev/null
+++ b/multimedia/xine-lib/PLIST.Darwin
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.Darwin,v 1.1 2016/02/24 16:18:41 jperkin Exp $
+include/xine/XineOpenGLView.h
+include/xine/XineVideoWindow.h
+include/xine/video_window.h
+lib/libxineMacOSXVideo.la
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_coreaudio.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_ao_out_coreaudio.so
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_macosx.a
+lib/xine/plugins/${XINE_MOD_DIR_VER}/xineplug_vo_out_macosx.so
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index 1cf0d2c299c..e4f0bb1d914 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2015/11/03 23:54:33 agc Exp $
+$NetBSD: distinfo,v 1.103 2016/02/24 16:18:41 jperkin Exp $
 
 SHA1 (xine-lib-1.2.6.tar.xz) = ac929eef2b7bf5c27699bbed612b953a01fccba5
 RMD160 (xine-lib-1.2.6.tar.xz) = 05edcd9a36e93d2fc9d1bf13cae3b32d4bd996da
@@ -23,4 +23,6 @@ SHA1 (patch-src-post-planar-expand.c) = 9d9ec1f5619f9a3d832bcace54d23011371f2067
 SHA1 (patch-src-post-planar-noise.c) = 2deabf5d80e2c45959a4f89bbf2528f7e1c9e1f5
 SHA1 (patch-src-post-planar-pp.c) = f5bea421785132c5f1422ae9f0d468974fb0ae5d
 SHA1 (patch-src-post-planar-unsharp.c) = 9f29c624f96a91760df960343096247d8c09c58d
+SHA1 (patch-src_video__out_Makefile.am) = c1d38c420efccdc68c0bd90f670b3075ad988188
+SHA1 (patch-src_video__out_macosx_Makefile.am) = 8350a75e3a4c0b2f684e07dcc18259fcc5b28115
 SHA1 (patch-src_xine-engine_Makefile.am) = e44ca141304e102faa40763ef083e8c1f60089e7
diff --git a/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
new file mode 100644
index 00000000000..36c504331d0
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-src_video__out_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_video__out_Makefile.am,v 1.1 2016/02/24 16:18:41 jperkin Exp $
+
+Libtool is unable to infer ObjC by itself.
+
+--- src/video_out/Makefile.am.orig	2014-06-09 16:08:42.000000000 +0000
++++ src/video_out/Makefile.am
+@@ -241,3 +241,4 @@ xineplug_vo_out_raw_la_CFLAGS = $(AM_CFL
+ xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m
+ xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS)
+ xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL
++xineplug_vo_out_macosx_la_LIBTOOLFLAGS = --tag=CC
diff --git a/multimedia/xine-lib/patches/patch-src_video__out_macosx_Makefile.am b/multimedia/xine-lib/patches/patch-src_video__out_macosx_Makefile.am
new file mode 100644
index 00000000000..bc14d32eea0
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-src_video__out_macosx_Makefile.am
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_video__out_macosx_Makefile.am,v 1.1 2016/02/24 16:18:41 jperkin Exp $
+
+Libtool is unable to infer ObjC by itself.
+
+--- src/video_out/macosx/Makefile.am.orig	2012-02-05 19:17:03.000000000 +0000
++++ src/video_out/macosx/Makefile.am
+@@ -11,3 +11,4 @@ lib_LTLIBRARIES = libxineMacOSXVideo.la
+ libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m
+ libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \
+ 				-version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE)
++libxineMacOSXVideo_la_LIBTOOLFLAGS = --tag=CC