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

[wahwah at users.sourceforge.net]

Revision: 20356
          http://gar.svn.sourceforge.net/gar/?rev=20356&view=rev
Author:   wahwah
Date:     2013-03-03 14:11:40 +0000 (Sun, 03 Mar 2013)
Log Message:
-----------
vlc/trunk: cleanup; attempt the 2.0.5 version instead of git

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

Modified: csw/mgar/pkg/vlc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vlc/trunk/Makefile	2013-03-01 14:33:14 UTC (rev 20355)
+++ csw/mgar/pkg/vlc/trunk/Makefile	2013-03-03 14:11:40 UTC (rev 20356)
@@ -2,29 +2,18 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = vlc
-VERSION = 2.1-git
+VERSION = 2.0.5
 GARTYPE = v2
 
 DESCRIPTION = VideoLAN Client, the cross-platform media player and streaming server
 define BLURB
 endef
 
-# MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/
-# DISTFILES  = $(DISTNAME).tar.bz2
+MASTER_SITES = http://download.videolan.org/pub/videolan/vlc/$(VERSION)/
+DISTFILES  = $(DISTNAME).tar.xz
 
-# Building from the git master which has patches submitted by Maciej
-MASTER_SITES = http://repo.or.cz/w/vlc/solaris.git/snapshot/
-DISTFILES = d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz
-
-NOTGITPATCH = 1
-
-DISTNAME = solaris
-
 PATCHFILES += 0006-Define-Encoding-in-vlc.desktop.patch
 
-# We need e.g. stdbool.h
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-
 VENDOR_URL = http://www.videolan.org/vlc/
 
 BUILD_DEP_PKGS += CSWliba52
@@ -32,20 +21,15 @@
 BUILD_DEP_PKGS += CSWlibxaudevel
 BUILD_DEP_PKGS += CSWlibxdmcpdevel
 BUILD_DEP_PKGS += CSWlibx11devel
+BUILD_DEP_PKGS += CSWautoconf
+BUILD_DEP_PKGS += CSWautomake
+BUILD_DEP_PKGS += CSWlibtool
 
-# 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
 GARCOMPILER = GNU
 
-# 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
 # Necessary to include _Xglobal_lock
@@ -175,10 +159,6 @@
 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:

Modified: csw/mgar/pkg/vlc/trunk/checksums
===================================================================
--- csw/mgar/pkg/vlc/trunk/checksums	2013-03-01 14:33:14 UTC (rev 20355)
+++ csw/mgar/pkg/vlc/trunk/checksums	2013-03-03 14:11:40 UTC (rev 20356)
@@ -1,2 +1 @@
-bd09bc490ecb8d19f1561a438c48043b  0006-Work-around-the-lack-of-dirfd.patch
-3857b512a3f1683178adef7e3c56e059  d843a2fc47bf6b9f4277310736b25caee8309ee7.tar.gz
+4f959c0766ada8cea5a72c65fce94ebe  vlc-2.0.5.tar.xz

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