Date: Tue, 18 Dec 2012 12:29:03 GMT From: Ivan Klymenko <fidaj@ukr.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174538: [patch] graphics/openjpeg update to 1.5.1 Message-ID: <201212181229.qBICT3UI087508@red.freebsd.org> Resent-Message-ID: <201212181230.qBICU0wM012496@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174538
>Category: ports
>Synopsis: [patch] graphics/openjpeg update to 1.5.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 18 12:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Ivan Klymenko
>Release: FreeBSD 9.1-RELEASE
>Organization:
individual
>Environment:
FreeBSD nonamehost 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243746: Sat Dec 1 18:35:21 MSK 2012 root@nonamehost:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
>How-To-Repeat:
>Fix:
patch
Patch attached with submission follows:
diff --git a/openjpeg-old/Makefile b/openjpeg/Makefile
index 019d61f..e3a5921 100644
--- a/openjpeg-old/Makefile
+++ b/openjpeg/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD: ports/graphics/openjpeg/Makefile,v 1.23 2012/12/17 17:21:29 svnexp Exp $
PORTNAME= openjpeg
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/openjpeg-old/files/patch-CMakeLists.txt b/openjpeg/files/patch-CMakeLists.txt
index fe834a1..949efaa 100644
--- a/openjpeg-old/files/patch-CMakeLists.txt
+++ b/openjpeg/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2012-09-13 09:58:39.000000000 +0200
-+++ CMakeLists.txt 2012-12-17 17:54:22.000000000 +0100
+--- CMakeLists.txt.orig 2012-12-18 16:07:14.812040409 +0400
++++ CMakeLists.txt 2012-12-18 16:13:24.352041353 +0400
@@ -54,7 +54,7 @@
endif(NOT OPENJPEG_SOVERSION)
SET(OPENJPEG_LIBRARY_PROPERTIES
diff --git a/openjpeg-old/files/patch-CMake_OpenJPEGConfig.cmake.in b/openjpeg-old/files/patch-CMake_OpenJPEGConfig.cmake.in
deleted file mode 100644
index 1a8fc1f..0000000
--- a/openjpeg-old/files/patch-CMake_OpenJPEGConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMake/OpenJPEGConfig.cmake.in~ 2012-02-07 04:49:55.000000000 -0600
-+++ CMake/OpenJPEGConfig.cmake.in 2012-04-09 05:05:46.024519656 -0500
-@@ -17,7 +17,7 @@ SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRAR
- SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
-
- # The configuration options.
--SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
-+SET(OPENJPEG_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
-
- # The "use" file.
- SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
diff --git a/openjpeg-old/files/patch-libopenjpeg-CMakeLists.txt b/openjpeg-old/files/patch-libopenjpeg-CMakeLists.txt
deleted file mode 100644
index 37fd08c..0000000
--- a/openjpeg-old/files/patch-libopenjpeg-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libopenjpeg/CMakeLists.txt.orig 2012-02-07 11:49:55.000000000 +0100
-+++ libopenjpeg/CMakeLists.txt 2012-06-03 14:29:44.000000000 +0200
-@@ -55,7 +55,7 @@
-
- # Install includes files
- INSTALL(FILES openjpeg.h
-- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
-+ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
- )
-
- # install man page of the library
diff --git a/openjpeg-old/files/patch-libopenjpeg1.pc.cmake b/openjpeg-old/files/patch-libopenjpeg1.pc.cmake
deleted file mode 100644
index 674e19b..0000000
--- a/openjpeg-old/files/patch-libopenjpeg1.pc.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- libopenjpeg1.pc.cmake~ 2012-02-07 04:49:55.000000000 -0600
-+++ libopenjpeg1.pc.cmake 2012-04-07 17:13:24.589503254 -0500
-@@ -1,8 +1,8 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--bindir=@OPENJPEG_INSTALL_BIN_DIR@
--datadir=@OPENJPEG_INSTALL_DATA_DIR@
--libdir=@OPENJPEG_INSTALL_LIB_DIR@
--includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
-+bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
-+datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
-+libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
-+includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
-
- Name: openjpeg
- Description: JPEG2000 files library
diff --git a/openjpeg-old/files/patch-opj_malloc.h b/openjpeg/files/patch-opj_malloc.h
index d1a6207..6070f78 100644
--- a/openjpeg-old/files/patch-opj_malloc.h
+++ b/openjpeg/files/patch-opj_malloc.h
@@ -1,10 +1,9 @@
---- libopenjpeg/opj_malloc.h.orig 2012-02-07 11:49:55.000000000 +0100
-+++ libopenjpeg/opj_malloc.h 2012-06-02 11:25:56.000000000 +0200
-@@ -85,8 +85,7 @@
- #define HAVE_MEMALIGN
+--- libopenjpeg/opj_malloc.h.orig 2012-09-13 11:58:39.000000000 +0400
++++ libopenjpeg/opj_malloc.h 2012-12-18 16:16:24.009042087 +0400
+@@ -88,7 +88,7 @@
/* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
-- #define HAVE_MEMALIGN
+ #elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
+ #define HAVE_MEMALIGN
- #include <malloc.h>
+ #include <stdlib.h>
#endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212181229.qBICT3UI087508>