Revision: 25969
http://sourceforge.net/p/gar/code/25969
Author: lblume
Date: 2016-10-05 15:42:07 +0000 (Wed, 05 Oct 2016)
Log Message:
-----------
openjpeg/trunk: Bump to 2.1.2; refactor changes in the build system
Modified Paths:
--------------
csw/mgar/pkg/openjpeg/trunk/Makefile
csw/mgar/pkg/openjpeg/trunk/checksums
Modified: csw/mgar/pkg/openjpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/Makefile 2016-10-05 08:21:56 UTC (rev
25968)
+++ csw/mgar/pkg/openjpeg/trunk/Makefile 2016-10-05 15:42:07 UTC (rev
25969)
@@ -1,5 +1,5 @@
NAME = openjpeg
-VERSION = 2.1.0
+VERSION = 2.1.2
GARTYPE = v2
DESCRIPTION = Open-source JPEG 2000 codec written in C
@@ -8,23 +8,21 @@
endef
VENDOR_URL = http://code.google.com/p/openjpeg/
-MASTER_SITES = $(SF_MIRROR)
-SF_PROJECT = openjpeg.mirror
-DISTFILES = $(DISTNAME).tar.gz
+GITHUB_USER = uclouvain
+MASTER_SITES = https://github.com/$(GITHUB_USER)/$(NAME)/archive/
+DISTFILES = v$(VERSION).tar.gz
LICENSE = LICENSE
-GARCOMPILER = GCC4
+GARCOMPILER = GCC5
-PATCHFILES += 0002-big-endian-uint16_t.patch
-
PACKAGES += CSWlibopenjp2-7
CATALOGNAME_CSWlibopenjp2-7 = libopenjp2_7
-PKGFILES_CSWlibopenjp2-7 += $(call
baseisadirs,$(libdir),libopenjp2\.so\.2\.1\.0)
+PKGFILES_CSWlibopenjp2-7 += $(call
baseisadirs,$(libdir),libopenjp2\.so\.2\.1\.2)
PKGFILES_CSWlibopenjp2-7 += $(call
baseisadirs,$(libdir),libopenjp2\.so\.7(\.\d+)*)
SPKG_DESC_CSWlibopenjp2-7 += $(DESCRIPTION), libopenjp2.so.7
RUNTIME_DEP_PKGS_CSWlibopenjp2-7 += CSWlibgcc-s1
-# For some reason the so.7 links to the so.2.1.0
-CHECKPKG_OVERRIDES_CSWlibopenjp2-7 +=
soname-not-part-of-filename|soname=libopenjp2.so.7|filename=libopenjp2.so.2.1.0
+# For some reason the so.7 links to the so.2.1.2
+CHECKPKG_OVERRIDES_CSWlibopenjp2-7 +=
soname-not-part-of-filename|soname=libopenjp2.so.7|filename=libopenjp2.so.2.1.2
PACKAGES += CSWopenjpeg-dev
CATALOGNAME_CSWopenjpeg-dev = openjpeg_dev
@@ -60,16 +58,31 @@
ISAEXEC = 1
CONFIGURE_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = custom
TEST_TARGET =
+SKIPTEST = 1
include gar/category.mk
configure-custom:
- (cd $(WORKSRC) && \
+ cd $(WORKSRC) && \
+ mkdir build && \
+ cd build && \
/usr/bin/env -i \
$(CONFIGURE_ENV) \
cmake \
- . \
- $(CMAKE_ARGS))
+ .. \
+ $(CMAKE_ARGS)
@$(MAKECOOKIE)
+build-custom:
+ cd $(WORKSRC)/build && \
+ $(BUILD_ENV) gmake
+ $(MAKECOOKIE)
+
+install-custom:
+ cd $(WORKSRC)/build && \
+ $(BUILD_ENV) gmake install DESTDIR=$(DESTDIR)
+ $(MAKECOOKIE)
+
Modified: csw/mgar/pkg/openjpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/openjpeg/trunk/checksums 2016-10-05 08:21:56 UTC (rev
25968)
+++ csw/mgar/pkg/openjpeg/trunk/checksums 2016-10-05 15:42:07 UTC (rev
25969)
@@ -1 +1 @@
-f6419fcc233df84f9a81eb36633c6db6 openjpeg-2.1.0.tar.gz
+40a7bfdcc66280b3c1402a0eb1a27624 v2.1.2.tar.gz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
