SF.net SVN: gar:[22282] csw/mgar/pkg/mplayer/branches/snapshot

[pfelecan at users.sourceforge.net]

Revision: 22282
          http://gar.svn.sourceforge.net/gar/?rev=22282&view=rev
Author:   pfelecan
Date:     2013-10-22 13:11:17 +0000 (Tue, 22 Oct 2013)
Log Message:
-----------
mplayer/branches/snapshot: X11 support

Modified Paths:
--------------
    csw/mgar/pkg/mplayer/branches/snapshot/Makefile

Added Paths:
-----------
    csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch

Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/Makefile	2013-10-22 11:13:53 UTC (rev 22281)
+++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile	2013-10-22 13:11:17 UTC (rev 22282)
@@ -33,6 +33,7 @@
 PATCHFILES		+=	0002-version-uses-bash.patch
 PATCHFILES		+=	0003-use-csw-catalog-for-documentation.patch
 PATCHFILES		+=	0004-test-sse-support.patch
+PATCHFILES		+=	0005-enhance-X-Windows-detection.patch
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386
@@ -150,6 +151,12 @@
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libxvidcore.so.4
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libz.so.1
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so.1
+CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libX11.so.4
+CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXext.so.0
+CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXinerama.so.1
+# these is available only for i386 and BTW is not part of our libraires
+CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libvdpau.so.1
+CHECKPKG_OVERRIDES_CSWmplayer	+=	missing-dependency|NVDAgraphics
 
 PACKAGES						+=	CSWmencoder
 CATALOGNAME_CSWmencoder			=	mencoder
@@ -222,8 +229,13 @@
 	mv ../ffmpeg ffmpeg
 	$(MAKECOOKIE)
 
-# configure is not configure !
-# must use internal dvdnav as our library is not a snapshot
+# - configure is not configure !
+# - must use internal dvdnav as our library is not a snapshot and
+#   mplayer uses new primitives
+# - run-time CPU detection is not implemented only for SPARC
+# - disable shared memory, used only for X11, which, in Solaris 10
+#    extensions doesn't support all the required primitives,
+#   e.g. XShmGetEventBase
 
 ifneq ($(GARCH),sparc)
 CPU_DETECTION	=--enable-runtime-cpudetection
@@ -239,6 +251,7 @@
 	--extra-cflags='-std=gnu99' \
 	--extra-ldflags='-lrt' \
 	$(CPU_DETECTION) \
+	--disable-shm \
 	--prefix=$(prefix) \
 	--codecsdir=$(libexecdir)/mplayer
 	$(MAKECOOKIE)

Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch	                        (rev 0)
+++ csw/mgar/pkg/mplayer/branches/snapshot/files/0005-enhance-X-Windows-detection.patch	2013-10-22 13:11:17 UTC (rev 22282)
@@ -0,0 +1,56 @@
+From f65b3b496e17ae71669e9dd3b3431ac709898e82 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 22 Oct 2013 14:12:27 +0200
+Subject: [PATCH] enhance X Windows detection
+
+---
+ configure | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 53bfb0d..407837e 100755
+--- a/configure
++++ b/configure
+@@ -4443,6 +4443,12 @@ echocheck "X11 headers presence"
+   fi
+ echores "$_x11_headers"
+ 
++ifBroken=''
++needsXlib=''
++if sunos; then
++	ifBroken="_broken"
++	needsXlib="X11/Xlib.h"
++fi
+ 
+ echocheck "X11"
+ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+@@ -4454,7 +4460,7 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+     else
+       ld_tmp="$I -lXext -lX11 $ld_pthread"
+     fi
+-    statement_check X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp &&
++    statement_check${ifBroken} ${needsXlib} X11/Xutil.h 'XCreateWindow(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)' $ld_tmp &&
+       libs_mplayer="$libs_mplayer $ld_tmp" && _x11=yes && break
+   done
+ fi
+@@ -4472,7 +4478,7 @@ echores "$_x11"
+ echocheck "Xss screensaver extensions"
+ if test "$_xss" = auto ; then
+   _xss=no
+-  statement_check "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes
++  statement_check${ifBroken} ${neddsXlib} "X11/extensions/scrnsaver.h" 'XScreenSaverSuspend(NULL, True)' -lXss && _xss=yes
+ fi
+ if test "$_xss" = yes ; then
+   def_xss='#define CONFIG_XSS 1'
+@@ -4598,7 +4604,7 @@ echores "$_vdpau"
+ echocheck "Xinerama"
+ if test "$_xinerama" = auto && test "$_x11" = yes ; then
+   _xinerama=no
+-  statement_check X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes
++  statement_check${ifBroken} ${needsXlib} X11/extensions/Xinerama.h 'XineramaIsActive(0)' -lXinerama && _xinerama=yes
+ fi
+ 
+ if test "$_xinerama" = yes ; then
+-- 
+1.8.3.4
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.