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

[janholzh at users.sourceforge.net]

Revision: 19373
          http://gar.svn.sourceforge.net/gar/?rev=19373&view=rev
Author:   janholzh
Date:     2012-10-04 08:42:32 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
x264/trunk: update to REV 2216

Revision Links:
--------------
    http://gar.svn.sourceforge.net/gar/?rev=2216&view=rev

Modified Paths:
--------------
    csw/mgar/pkg/x264/trunk/Makefile
    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-10-03 20:14:12 UTC (rev 19372)
+++ csw/mgar/pkg/x264/trunk/Makefile	2012-10-04 08:42:32 UTC (rev 19373)
@@ -15,7 +15,7 @@
 #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 = 999b753ff0f4dc872077f4fa90d465e948cbe656
+GIT_TREEISH_tig.git = 198a7ea13ccb727d4ea24b29f5da9b0292387309
 
 # This Patch file needs to be updated on every new version! 
 PATCHFILES += 0001-replace-version.sh.patch
@@ -32,8 +32,10 @@
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 GARCOMPILER = GCC4
 SKIPTEST = 1
-BUILD64_LIBS_ONLY = 1
 
+BUILD64 = 1
+ISAEXEC = 1
+
 BUILD_DEP_PKGS += CSWffmpeg-dev
 
 
@@ -49,30 +51,28 @@
 PACKAGES += CSWx264
 SPKG_DESC_CSWx264 = $(DESCRIPTION)
 # PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54
 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat54
-RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54
 RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2
 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51
 
-PACKAGES += CSWlibx264-125
-CATALOGNAME_CSWlibx264-125 = libx264_125
-PKGFILES_CSWlibx264-125 += $(call baseisadirs,$(libdir),libx264\.so\.125)
-PKGFILES_CSWlibx264-125 += $(call baseisadirs,$(libdir),libx264\.so\.125(\.\d+)*)
-SPKG_DESC_CSWlibx264-125 += $(DESCRIPTION), libx264.so.125
-RUNTIME_DEP_PKGS_CSWlibx264-125 += CSWlibgcc-s1
+PACKAGES += CSWlibx264-128
+CATALOGNAME_CSWlibx264-128 = libx264_128
+PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128)
+PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128(\.\d+)*)
+SPKG_DESC_CSWlibx264-128 += $(DESCRIPTION), libx264.so.128
+RUNTIME_DEP_PKGS_CSWlibx264-128 += 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-125
+RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-128
 
 #Some overrides
 CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase
-CHECKPKG_OVERRIDES_CSWlibx264-125 += pkginfo-description-not-starting-with-uppercase
-# seems to be checkpkg bug:
-CHECKPKG_OVERRIDES_CSWlibx264-125 += non-uniform-lib-versions-in-package|sonames=libx264.so.125
+CHECKPKG_OVERRIDES_CSWlibx264-128 += pkginfo-description-not-starting-with-uppercase
 
 
 

Modified: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch
===================================================================
--- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch	2012-10-03 20:14:12 UTC (rev 19372)
+++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch	2012-10-04 08:42:32 UTC (rev 19373)
@@ -37,10 +37,10 @@
 -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 2200"
++echo "#define X264_REV 2216"
 +echo "#define X264_REV_DIFF 0"
-+echo '#define X264_VERSION " r2200 999b753"'
-+echo '#define X264_POINTVER "0.125.2200 999b753"'
++echo '#define X264_VERSION " r2216 198a7ea"'
++echo '#define X264_POINTVER "0.128.2216 198a7ea"'
 +exit 0
 -- 
 1.7.9

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