[csw-devel] SF.net SVN: gar:[16149] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Nov 9 15:38:33 CET 2011 

Revision: 16149
          http://gar.svn.sourceforge.net/gar/?rev=16149&view=rev
Author:   dmichelsen
Date:     2011-11-09 14:38:33 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
vlc: Initial commit, does not fully compile

Added Paths:
-----------
    csw/mgar/pkg/vlc/
    csw/mgar/pkg/vlc/Makefile
    csw/mgar/pkg/vlc/branches/
    csw/mgar/pkg/vlc/tags/
    csw/mgar/pkg/vlc/trunk/
    csw/mgar/pkg/vlc/trunk/Makefile
    csw/mgar/pkg/vlc/trunk/checksums
    csw/mgar/pkg/vlc/trunk/files/
    csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch
    csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch
    csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch

Copied: csw/mgar/pkg/vlc/Makefile (from rev 14858, csw/mgar/pkg/template/Makefile)
===================================================================
--- csw/mgar/pkg/vlc/Makefile	                        (rev 0)
+++ csw/mgar/pkg/vlc/Makefile	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 


Property changes on: csw/mgar/pkg/vlc/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/Makefile	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1,68 @@
+# $Id$
+# TODO (release-critical prefixed with !, non release-critical with *)
+#
+NAME = vlc
+VERSION = 1.1.12
+GARTYPE = v2
+CATEGORIES = apps
+
+DESCRIPTION = VideoLAN Client, the cross-platform media player and streaming server
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES  = $(DISTNAME).tar.xz
+
+PATCHFILES += 0001-Disable-strange-check-this-may-be-dangerous.patch
+PATCHFILES += 0002-Hack-around-missing-packed-pragma.patch
+# PATCHFILES += 0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch
+
+# We need e.g. stdbool.h
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
+VENDOR_URL = http://www.videolan.org/vlc/
+
+BUILD_DEP_PKGS += CSWliba52
+BUILD_DEP_PKGS += CSWlibxcbdevel
+BUILD_DEP_PKGS += CSWlibxaudevel
+BUILD_DEP_PKGS += CSWlibxdmcpdevel
+BUILD_DEP_PKGS += CSWlibx11devel
+
+# This is for libxcb
+#EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
+#EXTRA_LIB = /opt/csw/X11/lib
+#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+
+# Sun Studio implements packed attributes differently and compilations bails out:
+#   "include/vlc_codecs.h", line 36: #error: FIXME
+GARCOMPILER = SOS12U2
+
+# Taken from http://wiki.videolan.org/Solaris
+EXTRA_CFLAGS = -D _XPG4_2 -D __SunOS -D __STDC_ISO_10646__ -D __EXTENSIONS__ -features=extensions -fast
+
+# Solaris has MAXNAMELEN instead of NAME_MAX
+EXTRA_CFLAGS += -DNAME_MAX=MAXNAMLEN
+
+# For inet_pton
+EXTRA_LINKER_FLAGS = -lsocket -lnsl
+
+# For missing /opt/csw/lib/libgconf-2.la and /opt/csw/lib/libgconf-2.la
+STRIP_LIBTOOL = 1
+
+CONFIGURE_ARGS += $(DIRPATHS)
+
+# Not there yet, part of ffmpeg
+CONFIGURE_ARGS += --disable-avcodec
+
+# No libpostproc yet
+#CONFIGURE_ARGS += --disable-postproc
+
+# No QT4 yet
+CONFIGURE_ARGS += --disable-qt4 --disable-skins2
+
+# Taken from http://wiki.videolan.org/Solaris
+CONFIGURE_ARGS += --disable-libgcrypt --disable-remoteosd --disable-glx --disable-lua --disable-mad --disable-swscale --disable-postproc --disable-a52 --disable-fribidi --with-gnu-ld=no --disable-xcb
+
+
+include gar/category.mk
+


Property changes on: csw/mgar/pkg/vlc/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/vlc/trunk/checksums
===================================================================
--- csw/mgar/pkg/vlc/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/checksums	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1 @@
+56cb9975725a12da8c84882bc00fdce0  vlc-1.1.12.tar.xz

Added: csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1,25 @@
+From 3d21a9253d711ada5c766a9968009073791ee4eb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 9 Nov 2011 13:22:04 +0100
+Subject: [PATCH] Disable strange check, this may be dangerous!
+
+---
+ src/misc/threads.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/misc/threads.c b/src/misc/threads.c
+index bbbb483..1eb612e 100644
+--- a/src/misc/threads.c
++++ b/src/misc/threads.c
+@@ -250,6 +250,6 @@ void vlc_global_mutex (unsigned n, bool acquire)
+         vlc_mutex_unlock (lock);
+ 
+     /* Compile-time assertion ;-) */
+-    char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX];
+-    (void) enough_locks;
++    /* char enough_locks[(sizeof (locks) / sizeof (locks[0])) - VLC_MAX_MUTEX];
++    (void) enough_locks; */
+ }
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1,25 @@
+From 7e4ffba8e64b9f1906d6a20ddca31e65bdd227c9 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 9 Nov 2011 14:59:05 +0100
+Subject: [PATCH] Hack around missing packed pragma
+
+---
+ include/vlc_codecs.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h
+index d97dcda..151f76c 100644
+--- a/include/vlc_codecs.h
++++ b/include/vlc_codecs.h
+@@ -33,7 +33,7 @@
+ #ifdef HAVE_ATTRIBUTE_PACKED
+ #   define ATTR_PACKED __attribute__((__packed__))
+ #else
+-#   error FIXME
++#   define ATTR_PACKED
+ #endif
+ 
+ /* Structures exported to the demuxers and decoders */
+-- 
+1.7.6.1
+

Added: csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch	2011-11-09 14:38:33 UTC (rev 16149)
@@ -0,0 +1,39 @@
+From f49471683d319bc45d4af3d6b9f4799520ff1264 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 9 Nov 2011 15:21:40 +0100
+Subject: [PATCH] Do not propagate vlc CFLAGS to linking
+
+---
+ bin/Makefile.am |    2 +-
+ bin/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index 19dfb57..117568a 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = vlc_win32_rc.rc.in
+ 
+ SUFFIXES = .rc.in .rc
+ 
+-AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
++AM_CFLAGS =
+ 
+ 
+ if !HAVE_WIN32
+diff --git a/bin/Makefile.in b/bin/Makefile.in
+index 056bb04..d0acbf8 100644
+--- a/bin/Makefile.in
++++ b/bin/Makefile.in
+@@ -646,7 +646,7 @@ vlcdatadir = @vlcdatadir@
+ vlclibdir = @vlclibdir@
+ EXTRA_DIST = vlc_win32_rc.rc.in
+ SUFFIXES = .rc.in .rc
+-AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
++AM_CFLAGS = 
+ @HAVE_WIN32_FALSE@@HAVE_WINCE_FALSE at vlc_SOURCES = vlc.c override.c
+ @HAVE_WIN32_TRUE at vlc_SOURCES = winvlc.c
+ @HAVE_WINCE_TRUE at vlc_SOURCES = winvlc.c
+-- 
+1.7.6.1
+

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

More information about the devel mailing list