Revision: 26539 http://sourceforge.net/p/gar/code/26539 Author: dmichelsen Date: 2019-06-04 12:09:04 +0000 (Tue, 04 Jun 2019) Log Message: ----------- x264/trunk: Update to 20190603
Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/checksums Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2019-05-27 08:13:21 UTC (rev 26538) +++ csw/mgar/pkg/x264/trunk/Makefile 2019-06-04 12:09:04 UTC (rev 26539) @@ -3,7 +3,7 @@ # # So it does not get lost. With gcc4.8 you now need -fno-aggressive-loop-optimizations: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/161226 NAME = x264 -VERSION = 64f4e24 +VERSION = 20190603 GARTYPE = v2 DESCRIPTION =The x264 project is encoding video streams into the H.264/MPEG-4 AVC format @@ -14,32 +14,48 @@ VENDOR_URL = http://www.videolan.org/developers/x264.html #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 = 64f4e24909924fceeea6e154d71b7dfbf586c7ea +#GIT_REPOS = http://git.videolan.org/git/x264.git +#GIT_TREEISH_tig.git = 64f4e24909924fceeea6e154d71b7dfbf586c7ea +MASTER_SITES += https://download.videolan.org/pub/videolan/x264/snapshots/ +DISTFILES += x264-snapshot-$(VERSION)-2245-stable.tar.bz2 +DISTNAME = $(NAME)-snapshot-$(VERSION)-2245-stable + # 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 -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +BUILD_DEP_PKGS += CSWffmpeg-dev -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +PACKAGES += CSWx264 +SPKG_DESC_CSWx264 = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil55 +RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale4 +PACKAGES += CSWlibx264-157 +SPKG_DESC_CSWlibx264-157 += $(DESCRIPTION), libx264.so.157 +PKGFILES_CSWlibx264-157 += $(call pkgfiles_lib,libx264.so.157) +RUNTIME_DEP_PKGS_CSWlibx264-157 += CSWlibgcc-s1 + +PACKAGES += CSWlibx264-dev +SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files +PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-157 + GARCOMPILER = GCC5 -SKIPTEST = 1 BUILD64 = 1 ISAEXEC = 1 -BUILD_DEP_PKGS += CSWffmpeg-dev +# The default /usr/ucb/install does not work +REINPLACEMENTS += install +REINPLACE_MATCH_install = /usr/ucb/install +REINPLACE_WITH_install = /opt/csw/bin/ginstall +REINPLACE_FILES_install += configure +# More info on mimpure-text: +# http://blogs.everycity.co.uk/alasdair/2009/05/text-relocation-remains-against-symbol-libx264/ -#More info on mimpure-text: http://blogs.everycity.co.uk/alasdair/2009/05/text-relocation-remains-against-symbol-libx264/ - CONFIGURE_ARGS-isa-pentium_pro = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" CONFIGURE_ARGS-isa-amd64 = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" --host=amd64-pc-solaris2.10 CONFIGURE_ARGS-isa-sparcv8plus = $(DIRPATHS) --enable-shared --extra-ldflags="-mimpure-text -lrt" --disable-asm @@ -46,31 +62,9 @@ CONFIGURE_ARGS-isa-sparcv9 = $(DIRPATHS) --enable-shared --enable-pic --disable-asm CONFIGURE_ARGS += $(CONFIGURE_ARGS-isa-$(ISA)) +# We need 'grep -q' +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) -PACKAGES += CSWx264 -SPKG_DESC_CSWx264 = $(DESCRIPTION) -# PKGFILES is catchall -#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54 -#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat54 -#RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 -#RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil52 +SKIPTEST ?= 1 -PACKAGES += CSWlibx264-148 -CATALOGNAME_CSWlibx264-148 = libx264_148 -PKGFILES_CSWlibx264-148 += $(call baseisadirs,$(libdir),libx264\.so\.148) -PKGFILES_CSWlibx264-148 += $(call baseisadirs,$(libdir),libx264\.so\.148(\.\d+)*) -SPKG_DESC_CSWlibx264-148 += $(DESCRIPTION), libx264.so.148 -RUNTIME_DEP_PKGS_CSWlibx264-148 += 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-148 - - include gar/category.mk - -# For 'grep -q' -PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/x264/trunk/checksums =================================================================== --- csw/mgar/pkg/x264/trunk/checksums 2019-05-27 08:13:21 UTC (rev 26538) +++ csw/mgar/pkg/x264/trunk/checksums 2019-06-04 12:09:04 UTC (rev 26539) @@ -1 +1 @@ -5db063ff42e04b8b093f6776e4242312 c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz +4c54677c6a192abd39f71773bbadc363 x264-snapshot-20190603-2245-stable.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.