[arch-commits] Commit in openjpeg/repos (5 files)
Pierre Schmitz
pierre at archlinux.org
Sat Sep 10 10:58:56 UTC 2011
Date: Saturday, September 10, 2011 @ 06:58:56
Author: pierre
Revision: 137659
db-move: moved openjpeg from [staging] to [extra] (i686)
Added:
openjpeg/repos/extra-i686/PKGBUILD
(from rev 137658, openjpeg/repos/staging-i686/PKGBUILD)
openjpeg/repos/extra-i686/openjpeg-1.4-autoconf.patch
(from rev 137658, openjpeg/repos/staging-i686/openjpeg-1.4-autoconf.patch)
Deleted:
openjpeg/repos/extra-i686/30_fix_build_for_debian.dpatch
openjpeg/repos/extra-i686/PKGBUILD
openjpeg/repos/staging-i686/
--------------------------------+
30_fix_build_for_debian.dpatch | 70 -----------------------------------
PKGBUILD | 63 ++++++++++++++++++-------------
openjpeg-1.4-autoconf.patch | 78 +++++++++++++++++++++++++++++++++++++++
3 files changed, 114 insertions(+), 97 deletions(-)
Deleted: extra-i686/30_fix_build_for_debian.dpatch
===================================================================
--- extra-i686/30_fix_build_for_debian.dpatch 2011-09-10 10:56:37 UTC (rev 137658)
+++ extra-i686/30_fix_build_for_debian.dpatch 2011-09-10 10:58:56 UTC (rev 137659)
@@ -1,70 +0,0 @@
-
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_fix_build_for_debian.dpatch by <robin.cornelius at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Dont apply the -s strip flag to the shared lib debian will do it for us
-## DP: where necessary
-## DP: Remove unnecessary linkage on lstdc++ and lm and add missing linkage for -lm
-
- at DPATCH@
-
-Index: ./Makefile
-===================================================================
---- ./Makefile (revision 96)
-+++ ./Makefile (working copy)
-@@ -18,8 +18,7 @@
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
-
--COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
--LIBRARIES = -lstdc++
-+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC -g $(EXTRA_CFLAGS)
-
- MODULES = $(SRCS:.c=.o)
- CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
-@@ -54,7 +53,7 @@
- $(AR) r $@ $(MODULES)
-
- $(SHAREDLIB): $(MODULES)
-- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
-+ $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) -lm
-
- install: OpenJPEG
- install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
-
-Index: ./indexer_JPIP/Makefile
-===================================================================
---- ./indexer_JPIP/Makefile (revision 95)
-+++ ./indexer_JPIP/Makefile (working copy)
-@@ -1,7 +1,6 @@
- CC = gcc
-
--LDFLAGS = -lm
--CFLAGS = -Wall
-+CFLAGS = -Wall $(EXTRA_CFLAGS)
-
- all: index_create
-
-Index: ./codec/Makefile
-===================================================================
---- ./codec/Makefile (revision 96)
-+++ ./codec/Makefile (working copy)
-@@ -1,13 +1,13 @@
- # Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k
-
--CFLAGS = -O3 -lstdc++ # -g -p -pg
-+CFLAGS = $(EXTRA_CFLAGS) # -g -p -pg
-
- all: j2k_to_image image_to_j2k
-
--j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-+j2k_to_image: j2k_to_image.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
--image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-+image_to_j2k: image_to_j2k.c
- gcc $(CFLAGS) compat/getopt.c index.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
- clean:
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-10 10:56:37 UTC (rev 137658)
+++ extra-i686/PKGBUILD 2011-09-10 10:58:56 UTC (rev 137659)
@@ -1,27 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=openjpeg
-pkgver=1.3
-_pkgver=v1_3
-pkgrel=3
-pkgdesc="An open source JPEG 2000 codec"
-arch=(i686 x86_64)
-license=('BSD')
-url="http://www.openjpeg.org"
-depends=('glibc')
-source=(http://www.openjpeg.org/openjpeg_${_pkgver}.tar.gz
- 30_fix_build_for_debian.dpatch)
-md5sums=('f9a3ccfa91ac34b589e9bf7577ce8ff9'
- '2557f485513e77f6dcea77f4741c4fa1')
-
-build() {
- cd "${srcdir}/OpenJPEG_${_pkgver}"
- patch -Np1 -i "${srcdir}/30_fix_build_for_debian.dpatch" || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
- install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
- tr '\r' '\n' < license.txt > "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
- chmod 644 "${pkgdir}/usr/share/licenses/openjpeg/license.txt" || return 1
- ln -s libopenjpeg.so.2 "${pkgdir}/usr/lib/libopenjpeg.so" || return 1
-}
Copied: openjpeg/repos/extra-i686/PKGBUILD (from rev 137658, openjpeg/repos/staging-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-10 10:58:56 UTC (rev 137659)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=openjpeg
+pkgver=1.4
+_pkgver=v1_4
+_revision=r697
+pkgrel=1
+pkgdesc="An open source JPEG 2000 codec"
+arch=(i686 x86_64)
+license=('BSD')
+url="http://www.openjpeg.org"
+depends=('zlib')
+source=(http://openjpeg.googlecode.com/files/openjpeg_${_pkgver}_sources_${_revision}.tgz
+ openjpeg-1.4-autoconf.patch)
+md5sums=('7870bb84e810dec63fcf3b712ebb93db'
+ '46d1d26b59ce546444f3fe8d7c685775')
+
+options=('!makeflags' '!libtool')
+
+build() {
+ cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+ patch -Np1 -i ${srcdir}/openjpeg-1.4-autoconf.patch
+ # make sure we use system libs
+ rm -rf libs
+ ./configure --prefix=/usr \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}_${_pkgver}_sources_${_revision}"
+ make DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/openjpeg"
+ install -m644 LICENSE "${pkgdir}/usr/share/licenses/openjpeg/LICENSE"
+}
Copied: openjpeg/repos/extra-i686/openjpeg-1.4-autoconf.patch (from rev 137658, openjpeg/repos/staging-i686/openjpeg-1.4-autoconf.patch)
===================================================================
--- extra-i686/openjpeg-1.4-autoconf.patch (rev 0)
+++ extra-i686/openjpeg-1.4-autoconf.patch 2011-09-10 10:58:56 UTC (rev 137659)
@@ -0,0 +1,78 @@
+diff -up openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/doc/Makefile.am
+--- openjpeg_v1_4_sources_r697/doc/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:47.000000000 -0600
++++ openjpeg_v1_4_sources_r697/doc/Makefile.am 2011-01-12 12:12:20.959518549 -0600
+@@ -20,30 +20,30 @@ all-local:
+ @cp man/man3/* .
+
+ install-data-hook:
+- $(INSTALL) -d $(doc_dir)
+- $(INSTALL) -d ${mandir}/man1 ${mandir}/man3
++ $(INSTALL) -d $(DESTDIR)$(doc_dir)
++ $(INSTALL) -d $(DESTDIR)${mandir}/man1 $(DESTDIR)${mandir}/man3
+ if with_libjpwl
+- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
+- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image*)
++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* )
+ endif
+- @(cd ${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+- @(cd ${mandir}/man3 && $(RM) libopenjpeg* )
++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) libopenjpeg* )
+ @gzip -f image_to_j2k.1 j2k_to_image.1 j2k_dump.1 libopenjpeg.3
+- @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz ${mandir}/man1
+- @cp libopenjpeg.3.gz ${mandir}/man3
++ @cp image_to_j2k.1.gz j2k_to_image.1.gz j2k_dump.1.gz $(DESTDIR)${mandir}/man1
++ @cp libopenjpeg.3.gz $(DESTDIR)${mandir}/man3
+ @$(RM) *\.gz
+ if with_libjpwl
+- @(cd ${mandir}/man1 && \
++ @(cd $(DESTDIR)${mandir}/man1 && \
+ $(LN_S) image_to_j2k.1.gz JPWL_image_to_j2k.1.gz && \
+ $(LN_S) j2k_to_image.1.gz JPWL_j2k_to_image.1.gz)
+ @(cd ${mandir}/man3 && $(LN_S) libopenjpeg.3.gz JPWL_libopenjpeg.3.gz)
+ endif
+- @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(doc_dir)
++ @$(INSTALL) -m 644 ../LICENSE ../CHANGES $(DESTDIR)$(doc_dir)
+
+ uninstall-hook:
+- @(cd ${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
++ @(cd $(DESTDIR)${mandir}/man1 && $(RM) JPWL_image_to_j2k* JPWL_j2k_to_image* && \
+ $(RM) image_to_j2k* j2k_to_image* j2k_dump* )
+- @(cd ${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
++ @(cd $(DESTDIR)${mandir}/man3 && $(RM) JPWL_libopenjpeg* && \
+ $(RM) libopenjpeg* )
+- @(cd $(doc_dir) && $(RM) * )
+- @rmdir $(doc_dir)
++ @(cd $(DESTDIR)$(doc_dir) && $(RM) * )
++ @rmdir $(DESTDIR)$(doc_dir)
+diff -up openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR openjpeg_v1_4_sources_r697/Makefile.am
+--- openjpeg_v1_4_sources_r697/Makefile.am.autoconf_DESTDIR 2011-01-02 12:14:55.000000000 -0600
++++ openjpeg_v1_4_sources_r697/Makefile.am 2011-01-12 12:15:37.006321242 -0600
+@@ -9,7 +9,7 @@ clean-local:
+
+ distclean-local: clean-local
+
+-pkgconf_dir = /usr/lib/pkgconfig
++pkgconf_dir = $(libdir)/pkgconfig
+
+ install-data-hook:
+ @echo ""
+@@ -17,12 +17,12 @@ install-data-hook:
+ cat $$f/.report.txt ; \
+ done
+ @echo ""
+- @echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
++ @echo "Installing: libopenjpeg1.pc $(DESTDIR)$(pkgconf_dir)"
+ @echo ""
+- @$(INSTALL) -d $(pkgconf_dir)
+- @cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
+- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
++ @$(INSTALL) -d $(DESTDIR)$(pkgconf_dir)
++ @cp libopenjpeg.pc $(DESTDIR)$(pkgconf_dir)/libopenjpeg1.pc
++ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc && \
+ $(LN_S) libopenjpeg1.pc libopenjpeg.pc)
+
+ uninstall-hook:
+- @(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
++ @(cd $(DESTDIR)$(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
More information about the arch-commits
mailing list