[csw-devel] SF.net SVN: gar:[17484] csw/mgar/pkg/x264/trunk

[janholzh at users.sourceforge.net]

Revision: 17484
          http://gar.svn.sourceforge.net/gar/?rev=17484&view=rev
Author:   janholzh
Date:     2012-03-21 09:36:19 +0000 (Wed, 21 Mar 2012)
Log Message:
-----------
x264/trunk: update to git:5c85e0a

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

Added Paths:
-----------
    csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch

Modified: csw/mgar/pkg/x264/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x264/trunk/Makefile	2012-03-21 09:26:45 UTC (rev 17483)
+++ csw/mgar/pkg/x264/trunk/Makefile	2012-03-21 09:36:19 UTC (rev 17484)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = x264
-VERSION = snapshot-20120306-2245
+VERSION = 5c85e0a
 GARTYPE = v2
 CATEGORIES = apps
 
@@ -12,9 +12,14 @@
 endef
 
 VENDOR_URL = http://www.videolan.org/developers/x264.html
-MASTER_SITES = ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ 
-DISTFILES  = $(DISTNAME).tar.bz2
+#MASTER_SITES = http://repo.or.cz/w/x264.git/snapshot/  
+#DISTFILES  = c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz
+GIT_REPOS = http://git.videolan.org/git/x264.git
+GIT_TREEISH_tig.git = 5c85e0a2b7992fcaab09418e3fcefc613cffc743
 
+# This Patch file needs to be updated on every new version! 
+PATCHFILES += 0001-replace-version.sh.patch
+
 # File name regex to get notifications about upstream software releases
 # NOTE: Use this only if the automatic regex creation
 #       does not work for your package
@@ -49,25 +54,25 @@
 RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2
 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51
 
-PACKAGES += CSWlibx264-120
-CATALOGNAME_CSWlibx264-120 = libx264_120
-PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120)
-PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.120(\.\d+)*)
-SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.120
-RUNTIME_DEP_PKGS_CSWlibx264-120 += CSWlibgcc-s1
+PACKAGES += CSWlibx264-122
+CATALOGNAME_CSWlibx264-122 = libx264_122
+PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122)
+PKGFILES_CSWlibx264-120 += $(call baseisadirs,$(libdir),libx264\.so\.122(\.\d+)*)
+SPKG_DESC_CSWlibx264-120 += $(DESCRIPTION), libx264.so.122
+RUNTIME_DEP_PKGS_CSWlibx264-122 += CSWlibgcc-s1
 
 PACKAGES += CSWlibx264-dev
 CATALOGNAME_CSWlibx264-dev = libx264_dev
 SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files
 PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so
 PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-120
+RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-122
 
 #Some overrides
 CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
-CHECKPKG_OVERRIDES_CSWlibx264-120 += pkginfo-description-not-starting-with-uppercase
+CHECKPKG_OVERRIDES_CSWlibx264-122 += pkginfo-description-not-starting-with-uppercase
 # seems to be checkpkg bug:
-CHECKPKG_OVERRIDES_CSWlibx264-120 += non-uniform-lib-versions-in-package|sonames=libx264.so.120
+CHECKPKG_OVERRIDES_CSWlibx264-122 += non-uniform-lib-versions-in-package|sonames=libx264.so.122
 
 
 

Modified: csw/mgar/pkg/x264/trunk/checksums
===================================================================
--- csw/mgar/pkg/x264/trunk/checksums	2012-03-21 09:26:45 UTC (rev 17483)
+++ csw/mgar/pkg/x264/trunk/checksums	2012-03-21 09:36:19 UTC (rev 17484)
@@ -1 +1 @@
-438b90c8caa5c3957c081ba1bb10e6ca  x264-snapshot-20120306-2245.tar.bz2
+5db063ff42e04b8b093f6776e4242312  c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz

Added: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch
===================================================================
--- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch	                        (rev 0)
+++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch	2012-03-21 09:36:19 UTC (rev 17484)
@@ -0,0 +1,47 @@
+From 6d62d0bfa41a80d0afb547ec87e20ea8cc9c0740 Mon Sep 17 00:00:00 2001
+From: Jan Holzhueter <jh at opencsw.org>
+Date: Wed, 21 Mar 2012 10:12:19 +0100
+Subject: [PATCH] replace version.sh
+
+---
+ version.sh |   29 ++++++-----------------------
+ 1 files changed, 6 insertions(+), 23 deletions(-)
+
+diff --git a/version.sh b/version.sh
+index 5466ef2..a1d43eb 100755
+--- a/version.sh
++++ b/version.sh
+@@ -1,24 +1,7 @@
+ #!/bin/bash
+-[ -n "$1" ] && cd $1
+-git rev-list HEAD | sort > config.git-hash
+-LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
+-if [ $LOCALVER \> 1 ] ; then
+-    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
+-    VER_DIFF=$(($LOCALVER-$VER))
+-    echo "#define X264_REV $VER"
+-    echo "#define X264_REV_DIFF $VER_DIFF"
+-    if [ $VER_DIFF != 0 ] ; then
+-        VER="$VER+$VER_DIFF"
+-    fi
+-    if git status | grep -q "modified:" ; then
+-        VER="${VER}M"
+-    fi
+-    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
+-    echo "#define X264_VERSION \" r$VER\""
+-else
+-    echo "#define X264_VERSION \"\""
+-    VER="x"
+-fi
+-rm -f config.git-hash
+-API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
+-echo "#define X264_POINTVER \"0.$API.$VER\""
++
++echo "#define X264_REV 2184"
++echo "#define X264_REV_DIFF 0"
++echo '#define X264_VERSION " r2184 5c85e0a"'
++echo '#define X264_POINTVER "0.122.2184 5c85e0a"'
++exit 0
+-- 
+1.7.9
+

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