[csw-devel] SF.net SVN: gar:[17274] csw/mgar/pkg/vlc/trunk

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Fri Mar 2 22:45:51 CET 2012


Revision: 17274
          http://gar.svn.sourceforge.net/gar/?rev=17274&view=rev
Author:   wahwah
Date:     2012-03-02 21:45:51 +0000 (Fri, 02 Mar 2012)
Log Message:
-----------
vlc/trunk: Building from a git snapshot

Modified Paths:
--------------
    csw/mgar/pkg/vlc/trunk/Makefile
    csw/mgar/pkg/vlc/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch

Removed Paths:
-------------
    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
    csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch

Modified: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/Makefile	2012-03-02 21:45:51 UTC (rev 17274)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = vlc
-VERSION = 1.2-git
+VERSION = 2.1-git
 GARTYPE = v2
 CATEGORIES = apps
 
@@ -13,20 +13,16 @@
 # MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/
 # DISTFILES  = $(DISTNAME).tar.bz2
 
-# Solaris port
+# Building from the git master which has patches submitted by Maciej
 MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/
-DISTFILES = 36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz
+DISTFILES = d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz
 
+NOTGITPATCH = 1
+
 DISTNAME = solaris
 
-# WORKSRC = $(WORKDIR)/solaris
+PATCHFILES += 0006-Define-Encoding-in-vlc.desktop.patch
 
-# 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
-PATCHFILES += 0004-Bootstrap-on-Solaris.patch
-PATCHFILES += 0005-Work-around-the-lack-of-dirfd.patch
-
 # We need e.g. stdbool.h
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -39,9 +35,9 @@
 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
+# 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
@@ -65,18 +61,20 @@
 CONFIGURE_ARGS += $(DIRPATHS)
 
 # Not there yet, part of ffmpeg
-CONFIGURE_ARGS += --disable-avcodec
+# CONFIGURE_ARGS += --disable-avcodec
 
-# x264.c:431:9: error: 'x264_open_gop_names' undeclared (first use in this
-# function)
-CONFIGURE_ARGS += --disable-x264
+# No QT4 yet
+CONFIGURE_ARGS += --disable-qt4
+CONFIGURE_ARGS += --disable-skins2
 
-# No libpostproc yet
-#CONFIGURE_ARGS += --disable-postproc
+CONFIGURE_ARGS_i386 += --extra-cflags="-mfpmath=sse -msse"
+CONFIGURE_ARGS_i386 += --extra-cxxflags="-mfpmath=sse -msse"
 
-# No QT4 yet
-CONFIGURE_ARGS += --disable-qt4 --disable-skins2
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
+CONFIGURE_ARGS += --disable-mmx
+CONFIGURE_ARGS += --disable-sse
+
 # Taken from http://wiki.videolan.org/Solaris
 # CONFIGURE_ARGS += --disable-libgcrypt
 # CONFIGURE_ARGS += --disable-remoteosd
@@ -88,7 +86,7 @@
 # CONFIGURE_ARGS += --disable-a52
 # CONFIGURE_ARGS += --disable-fribidi
 # CONFIGURE_ARGS += --with-gnu-ld=no
-# CONFIGURE_ARGS += --disable-xcb
+CONFIGURE_ARGS += --disable-xcb
 
 SKIPTEST = 1
 
@@ -96,40 +94,59 @@
 # The catch-all package
 SPKG_DESC_CSWvlc = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWvlc += CSWfconfig
+RUNTIME_DEP_PKGS_CSWvlc += CSWfribidi
+RUNTIME_DEP_PKGS_CSWvlc += CSWliba52
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavcodec53
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavformat53
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibavutil51
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibcairo2
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibdvdread
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibflac8
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgcrypt11
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgdk-pixbuf2-0-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgio2-0-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibglib2-0-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgnutls26
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibgpg-error0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibgthread2-0-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibkate1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibmad0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibogg0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibpng12-0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibpostproc52
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibproxy
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibrsvg2-2
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibsamplerate0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsdl1-2-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsmbclient0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeex1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibspeexdsp1
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibsqlite3-0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibswscale2
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheora0
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoradec1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibtheoraenc1
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlc5
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvlccore5
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbis0
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibvorbisenc2
+RUNTIME_DEP_PKGS_CSWvlc += CSWlibx264-120
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibxml2-2
 RUNTIME_DEP_PKGS_CSWvlc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWvlc += CSWlua
 RUNTIME_DEP_PKGS_CSWvlc += CSWsdlimage
+
 CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/audio-vlc-default.sh
 CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/vlc/utils/video-vlc-default.sh
 CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/vlc/intf-vcd.txt
+CHECKPKG_OVERRIDES_CSWvlc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/vlc/vlc-thumb.c
 
 PACKAGES += CSWvlc-dev
 CATALOGNAME_CSWvlc-dev = vlc_dev
@@ -155,9 +172,18 @@
 RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibvlccore5 += CSWlibiconv2
 
+# Doesn't work...?
+# CONFIG_SHELL = /opt/csw/bin/bash
+# EXTRA_EXPORTS += CONFIG_SHELL
+
 include gar/category.mk
 
 pre-configure-modulated:
 	# bootstrap defines #!/bin/sh and $(dirname ...)
-	(cd $(WORKSRC) && $(CONFIGURE_ENV) bash ./bootstrap)
+	(cd $(WORKSRC) && $(CONFIGURE_ENV) \
+		CONFIG_SHELL=/opt/csw/bin/bash \
+		/opt/csw/bin/bash \
+		./bootstrap)
 	@$(MAKECOOKIE)
+
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/vlc/trunk/checksums
===================================================================
--- csw/mgar/pkg/vlc/trunk/checksums	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/checksums	2012-03-02 21:45:51 UTC (rev 17274)
@@ -1 +1,2 @@
-5dfeae611f841bf29549f0f2619b1c35  36ddbe70462f36a16c30c75e424cdc768f429fcd.tar.gz
+bd09bc490ecb8d19f1561a438c48043b  0006-Work-around-the-lack-of-dirfd.patch
+3857b512a3f1683178adef7e3c56e059  d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz

Deleted: 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	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0001-Disable-strange-check-this-may-be-dangerous.patch	2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,25 +0,0 @@
-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
-

Deleted: 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	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0002-Hack-around-missing-packed-pragma.patch	2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,25 +0,0 @@
-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
-

Deleted: 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	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0003-Do-not-propagate-vlc-CFLAGS-to-linking.patch	2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,39 +0,0 @@
-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
-

Deleted: csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch	2012-03-02 21:04:42 UTC (rev 17273)
+++ csw/mgar/pkg/vlc/trunk/files/0004-Bootstrap-on-Solaris.patch	2012-03-02 21:45:51 UTC (rev 17274)
@@ -1,71 +0,0 @@
-From 5d5c633d80070ec43f7780e89fe15602dbc0b078 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 19 Feb 2012 09:47:31 +0100
-Subject: [PATCH 1/2] Bootstrap on Solaris
-
-Solaris /bin/sh does not support "$( ... )" nor "if ! test ..."
-
-Tested on Solaris 10.
----
- bootstrap     |   14 +++++++++++---
- modules/genmf |    6 ++++--
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/bootstrap b/bootstrap
-index d315be2..1f478e2 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -22,7 +22,7 @@ export CYGWIN
- set -e
- set -x
- 
--cd "$(dirname "$0")"
-+cd "`dirname "$0"`"
- 
- ##
- ## Check for various tools
-@@ -66,8 +66,16 @@ fi
- 
- # Check for autopoint (GNU gettext)
- export AUTOPOINT
--test "$AUTOPOINT" || AUTOPOINT=autopoint
--if ! "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
-+if test "$AUTOPOINT"; then
-+  :
-+else
-+  AUTOPOINT=autopoint
-+fi
-+if "$AUTOPOINT" --dry-run --force >/dev/null 2>&1; then
-+  # Solaris /bin/sh does not support "if ! test ...", we have to invert the
-+  # expression and use the "else" statement.
-+  :
-+else
-   AUTOPOINT=true
-   echo > ABOUT-NLS
- fi
-diff --git a/modules/genmf b/modules/genmf
-index d7b2887..11cd702 100755
---- a/modules/genmf
-+++ b/modules/genmf
-@@ -7,14 +7,16 @@
- ##  Authors: Sam Hocevar <sam at zoy.org>
- ##           Rémi Denis-Courmont <rem # videolan # org>
- 
--cd $(dirname "$0")/.. || exit 1
-+cd `dirname "$0"`/.. || exit 1
- 
- while test "$1"
- do
-   printf "."
-   dir="$1"
-   modf="modules/${dir}/Modules.am"
--  if ! test -f "$modf"; then
-+  if test -f "$modf"; then
-+    :
-+  else
-     echo "$modf does not exist!" >&2
-     exit 1
-   fi
--- 
-1.7.5.4
-

Added: csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch
===================================================================
--- csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch	                        (rev 0)
+++ csw/mgar/pkg/vlc/trunk/files/0006-Define-Encoding-in-vlc.desktop.patch	2012-03-02 21:45:51 UTC (rev 17274)
@@ -0,0 +1,26 @@
+From 5d548d76d99791231058e1650bb608aa454a2d0d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Tue, 28 Feb 2012 09:04:51 +0100
+Subject: [PATCH] Define "Encoding" in vlc.desktop
+
+"Encoding" is an obsolete key, but on Solaris 10 it seems to be necessary for
+VLC to build.
+---
+ share/vlc.desktop.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/share/vlc.desktop.in b/share/vlc.desktop.in
+index 741e983..141686e 100644
+--- a/share/vlc.desktop.in
++++ b/share/vlc.desktop.in
+@@ -3,6 +3,7 @@ Version=1.0
+ Name=VLC media player
+ GenericName=Media player
+ Comment=Read, capture, broadcast your multimedia streams
++Encoding=UTF-8
+ Name[bn]=VLC মিডিয়া প্লেয়ার
+ Comment[bn]=আপনার মাল্টিমিডিয়া স্ট্রীম পড়ুন, ধরে রাখুন এবং ছড়িয়ে দিন
+ Name[br]=VLC lenner mediaoù
+-- 
+1.7.9
+

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