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

[pfelecan at users.sourceforge.net]

Revision: 22292
          http://gar.svn.sourceforge.net/gar/?rev=22292&view=rev
Author:   pfelecan
Date:     2013-10-23 15:12:51 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
mplayer/branches/snapshot:
- memalign detection and support patches
- new snapshot
- new run-time dependency
- ability to patch the ffmepg snapshot used

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

Added Paths:
-----------
    csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch
    csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch

Modified: csw/mgar/pkg/mplayer/branches/snapshot/Makefile
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/Makefile	2013-10-23 12:02:46 UTC (rev 22291)
+++ csw/mgar/pkg/mplayer/branches/snapshot/Makefile	2013-10-23 15:12:51 UTC (rev 22292)
@@ -34,6 +34,8 @@
 PATCHFILES		+=	0003-use-csw-catalog-for-documentation.patch
 PATCHFILES		+=	0004-test-sse-support.patch
 PATCHFILES		+=	0005-enhance-X-Windows-detection.patch
+PATCHFILES		+=	0006-fix-memalign-detection.patch
+PATCHFILES		+=	0007-fix-memalign-prototype.patch
 
 PACKAGING_PLATFORMS	=	solaris10-sparc
 PACKAGING_PLATFORMS	+=	solaris10-i386
@@ -119,6 +121,10 @@
 # only on BO build farm; on my build farm it's included and detected TODO
 CHECKPKG_OVERRIDES_CSWmplayer	+=	surplus-dependency|CSWlibaudiofile0
 
+# this cannot be computed:
+RUNTIME_DEP_PKGS_CSWmplayer		+=	CSWunrar
+CHECKPKG_OVERRIDES_CSWmplayer	+=	surplus-dependency|CSWunrar
+
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libGL.so
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libSDL-1.2.so.0
 CHECKPKG_OVERRIDES_CSWmplayer	+=	no-direct-binding|/opt/csw/bin/mplayer|is|not|directly|bound|to|soname|libXt.so.4
@@ -226,7 +232,8 @@
 
 post-extract:
 	cd $(WORKSRC) && \
-	mv ../ffmpeg ffmpeg
+	mv ../ffmpeg ffmpeg && \
+	rm -f .gitignore
 	$(MAKECOOKIE)
 
 # - configure is not configure !

Modified: csw/mgar/pkg/mplayer/branches/snapshot/checksums
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/checksums	2013-10-23 12:02:46 UTC (rev 22291)
+++ csw/mgar/pkg/mplayer/branches/snapshot/checksums	2013-10-23 15:12:51 UTC (rev 22292)
@@ -1,2 +1,2 @@
-0e7a2ba888956df3396b7795138d6522  ffmpeg-snapshot.tar.bz2
-89cacb1cd8734f2d9fd3f60fa08d50da  mplayer-export-snapshot.tar.bz2
+1974183d76b42a1d343ee211396834c5  ffmpeg-snapshot.tar.bz2
+1ccfd06282fd705a307e0907ee9c8063  mplayer-export-snapshot.tar.bz2

Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch	                        (rev 0)
+++ csw/mgar/pkg/mplayer/branches/snapshot/files/0006-fix-memalign-detection.patch	2013-10-23 15:12:51 UTC (rev 22292)
@@ -0,0 +1,24 @@
+From 291e34c28c9d9e7f488da650d0df9e907d14f991 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 23 Oct 2013 14:34:30 +0200
+Subject: [PATCH] fix  memalign detection
+
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure b/configure
+index 407837e..89368a7 100755
+--- a/configure
++++ b/configure
+@@ -3703,6 +3703,7 @@ echocheck "memalign()"
+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
+ _memalign=no
+ statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes
++sunos && [ "${_memalign}" = "no" ] && statement_check stdlib.h 'memalign(64, sizeof(char))' && _memalign=yes
+ if test "$_memalign" = yes ; then
+   def_memalign='#define HAVE_MEMALIGN 1'
+ else
+-- 
+1.8.3.4
+

Added: csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch
===================================================================
--- csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch	                        (rev 0)
+++ csw/mgar/pkg/mplayer/branches/snapshot/files/0007-fix-memalign-prototype.patch	2013-10-23 15:12:51 UTC (rev 22292)
@@ -0,0 +1,27 @@
+From 20d2bba739c17c9c3f7148fe2287e5ef3a50c5a7 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 23 Oct 2013 15:58:38 +0200
+Subject: [PATCH] fix memalign prototype
+
+---
+ ffmpeg/libavutil/mem.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpeg/libavutil/mem.c b/ffmpeg/libavutil/mem.c
+index 5aad97a..488e433 100644
+--- a/ffmpeg/libavutil/mem.c
++++ b/ffmpeg/libavutil/mem.c
+@@ -31,6 +31,10 @@
+ #include <limits.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#if defined(sun)
++/* when _XOPEN_SOURCE is defined, the prototype is excluded from stdlib!? */
++extern void *memalign(size_t, size_t);
++#endif /* : defined(sun) */
+ #include <string.h>
+ #if HAVE_MALLOC_H
+ #include <malloc.h>
+-- 
+1.8.3.4
+

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