Revision: 25669 http://sourceforge.net/p/gar/code/25669 Author: janholzh Date: 2016-04-18 15:31:37 +0000 (Mon, 18 Apr 2016) Log Message: ----------- x265/trunk: inital commit
Added Paths: ----------- csw/mgar/pkg/x265/ csw/mgar/pkg/x265/Makefile csw/mgar/pkg/x265/branches/ csw/mgar/pkg/x265/tags/ csw/mgar/pkg/x265/trunk/ csw/mgar/pkg/x265/trunk/Makefile csw/mgar/pkg/x265/trunk/checksums csw/mgar/pkg/x265/trunk/files/ csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch Added: csw/mgar/pkg/x265/Makefile =================================================================== --- csw/mgar/pkg/x265/Makefile (rev 0) +++ csw/mgar/pkg/x265/Makefile 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Index: csw/mgar/pkg/x265/trunk =================================================================== --- csw/mgar/pkg/x265/trunk 2016-04-18 12:05:37 UTC (rev 25668) +++ csw/mgar/pkg/x265/trunk 2016-04-18 15:31:37 UTC (rev 25669) Property changes on: csw/mgar/pkg/x265/trunk ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +work Added: csw/mgar/pkg/x265/trunk/Makefile =================================================================== --- csw/mgar/pkg/x265/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x265/trunk/Makefile 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,76 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = x265 +VERSION = 1.9 +GARTYPE = v2 + +DESCRIPTION = The x265 is encoding video streams into the H.265/MPEG-H HEVC format +define BLURB + x265 is a free software library and application for encoding video streams into the H.265/MPEG-H HEVC compression format, and is released under the terms of the GNU GPL. +endef + +MASTER_SITES = https://bitbucket.org/multicoreware/x265/downloads/ +DISTNAME = $(NAME)_$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-add_posix_memalign.patch +PATCHFILES += 0002-remove_unknown_linker_option.patch + +PACKAGES += CSWx265 +SPKG_DESC_CSWx265 = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx265 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWx265 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWx265 += CSWlibx265-79 + +PACKAGES += CSWlibx265-79 +CATALOGNAME_CSWlibx265-79 = libx265_79 +SPKG_DESC_CSWlibx265-79 += $(DESCRIPTION), libx265.so.79 +PKGFILES_CSWlibx265-79 += $(call baseisadirs,$(libdir),libx265\.so\.79) +PKGFILES_CSWlibx265-79 += $(call baseisadirs,$(libdir),libx265\.so\.79(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibx265-79 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibx265-79 += CSWlibstdc++6 + +PACKAGES += CSWx265-dev +CATALOGNAME_CSWx265-dev = x265_dev +SPKG_DESC_CSWx265-dev += $(DESCRIPTION), development files +PKGFILES_CSWx265-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWx265-dev += CSWlibx265-79 + + +GARCOMPILER = GCC5 +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_SCRIPTS = custom + +CONFIGURE_ARGS = $(DIRPATHS) +CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" +CMAKE_ARGS += -DCMAKE_INSTALL_PREFIX="$(prefix)" +#CMAKE_ARGS += "-DBIN_INSTALL_DIR:STRING=$(subst $(prefix)/,,$(bindir))" +CMAKE_ARGS += -DBIN_INSTALL_DIR:STRING="$(bindir)" +#CMAKE_ARGS += "-DLIB_INSTALL_DIR:STRING=$(subst $(prefix)/,,$(libdir))" +CMAKE_ARGS += -DLIB_INSTALL_DIR:STRING="$(libdir)" +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_C_LINK_FLAGS="$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_LINK_FLAGS="$(LDFLAGS)" +CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" +CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON +CMAKE_ARGS += "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" +CMAKE_ARGS += "-DENABLE_PIC:BOOL=ON" + +SKIPTEST = 1 + + +include gar/category.mk + +configure-custom: + (cd $(WORKSRC)&& \ + /usr/bin/env -i \ + $(CONFIGURE_ENV) \ + cmake \ + ./source \ + $(CMAKE_ARGS)) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/x265/trunk/Makefile ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property Added: csw/mgar/pkg/x265/trunk/checksums =================================================================== --- csw/mgar/pkg/x265/trunk/checksums (rev 0) +++ csw/mgar/pkg/x265/trunk/checksums 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1 @@ +f34a1c4c660ff07511365cb0983cf164 x265_1.9.tar.gz Added: csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch =================================================================== --- csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch (rev 0) +++ csw/mgar/pkg/x265/trunk/files/0001-add_posix_memalign.patch 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,49 @@ +From ad937a7169b9b36e3a3e65ce3fcd94b1513be342 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Mon, 18 Apr 2016 15:25:59 +0200 +Subject: [PATCH] add_posix_memalign + +--- + source/common/common.cpp | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/source/common/common.cpp b/source/common/common.cpp +index 673aabb..539b557 100644 +--- a/source/common/common.cpp ++++ b/source/common/common.cpp +@@ -25,6 +25,7 @@ + #include "slice.h" + #include "threading.h" + #include "x265.h" ++#include <stdlib.h> + + #if _WIN32 + #include <sys/types.h> +@@ -35,6 +36,24 @@ + + namespace X265_NS { + ++ ++int posix_memalign(void **memptr, size_t alignment, size_t size) ++{ ++ void *ptr = NULL; ++ int error = 0; ++ ++ if (alignment == 0 || ++ (alignment & (sizeof (void *) - 1)) != 0 || ++ (alignment & (alignment - 1)) != 0) ++ error = EINVAL; ++ else if (size != 0 && ++ (ptr = memalign(alignment, size)) == NULL) ++ error = ENOMEM; ++ ++ *memptr = ptr; ++ return (error); ++} ++ + #if CHECKED_BUILD || _DEBUG + int g_checkFailures; + #endif +-- +2.4.0 + Added: csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch =================================================================== --- csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch (rev 0) +++ csw/mgar/pkg/x265/trunk/files/0002-remove_unknown_linker_option.patch 2016-04-18 15:31:37 UTC (rev 25669) @@ -0,0 +1,25 @@ +From 279b7318a589ea14f317cd538721985a85158cc1 Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Mon, 18 Apr 2016 15:50:20 +0200 +Subject: [PATCH] remove_unkown_linker_option + +--- + source/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 8102847..5d85c84 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -481,7 +481,7 @@ if(ENABLE_SHARED) + elseif(CYGWIN) + # Cygwin is not officially supported or tested. MinGW with msys is recommended. + else() +- list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack") ++ list(APPEND LINKER_OPTIONS "") + endif() + endif() + set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD}) +-- +2.4.0 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.