Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/openjpeg/files: openjpeg-1.5.1-build.patch
Date: Thu, 06 Jun 2013 12:10:17
Message-Id: 20130606121010.598EE20081@flycatcher.gentoo.org
1 xmw 13/06/06 12:10:10
2
3 Added: openjpeg-1.5.1-build.patch
4 Log:
5 Version bump (bug 440086), non-maint commit
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
8
9 Revision Changes Path
10 1.1 media-libs/openjpeg/files/openjpeg-1.5.1-build.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/openjpeg/files/openjpeg-1.5.1-build.patch?rev=1.1&content-type=text/plain
14
15 Index: openjpeg-1.5.1-build.patch
16 ===================================================================
17 Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg.git;a=tree
18
19 --- openjpeg-1.5.1/CMakeLists.txt
20 +++ openjpeg-1.5.1/CMakeLists.txt
21 @@ -287,11 +287,4 @@
22 DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
23 )
24
25 -#-----------------------------------------------------------------------------
26 -# install CHANGES and LICENSE
27 -IF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
28 - INSTALL(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
29 -ENDIF(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
30 -INSTALL(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
31 -
32 INCLUDE (CMake/OpenJPEGCPack.cmake)
33 --- openjpeg-1.5.1/libopenjpeg/CMakeLists.txt
34 +++ openjpeg-1.5.1/libopenjpeg/CMakeLists.txt
35 @@ -57,6 +57,10 @@
36 INSTALL(FILES openjpeg.h
37 DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
38 )
39 +INSTALL( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
40 + \"${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h\"
41 + \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h\")"
42 +)
43
44 # install man page of the library
45 INSTALL(
46 --- openjpeg-1.5.1/libopenjpeg1.pc.cmake
47 +++ openjpeg-1.5.1/libopenjpeg1.pc.cmake
48 @@ -2,7 +2,7 @@
49 bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
50 datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
51 libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
52 -includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@
53 +includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@
54
55 Name: openjpeg
56 Description: JPEG2000 files library