From 2b97c4f85a575fd890236cd86b2048ccbc3f6a33 Mon Sep 17 00:00:00 2001 From: piernov Date: Sun, 13 May 2012 18:11:08 +0200 Subject: kerberos 1.10.1-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjpeg/.footprint.i686 | 33 ++++++++++++++-- openjpeg/.footprint.x86_64 | 33 ++++++++++++++-- openjpeg/.md5sum.i686 | 5 ++- openjpeg/.md5sum.x86_64 | 5 ++- openjpeg/30_fix_build_for_debian.dpatch | 70 --------------------------------- openjpeg/Pkgfile | 22 +++++------ 6 files changed, 75 insertions(+), 93 deletions(-) delete mode 100644 openjpeg/30_fix_build_for_debian.dpatch (limited to 'openjpeg') diff --git a/openjpeg/.footprint.i686 b/openjpeg/.footprint.i686 index fa03c1b41..87fd62eb1 100644 --- a/openjpeg/.footprint.i686 +++ b/openjpeg/.footprint.i686 @@ -1,8 +1,33 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/image_to_j2k +-rwxr-xr-x root/root usr/bin/j2k_dump +-rwxr-xr-x root/root usr/bin/j2k_to_image drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/openjpeg.h +drwxr-xr-x root/root usr/include/openjpeg-1.5/ +-rw-r--r-- root/root usr/include/openjpeg-1.5/openjpeg.h +lrwxrwxrwx root/root usr/include/openjpeg.h -> openjpeg-1.5/openjpeg.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libopenjpeg-2.1.3.0.so -rw-r--r-- root/root usr/lib/libopenjpeg.a -lrwxrwxrwx root/root usr/lib/libopenjpeg.so -> libopenjpeg.so.2 -lrwxrwxrwx root/root usr/lib/libopenjpeg.so.2 -> libopenjpeg-2.1.3.0.so +-rwxr-xr-x root/root usr/lib/libopenjpeg.la +lrwxrwxrwx root/root usr/lib/libopenjpeg.so -> libopenjpeg.so.1.5.0 +lrwxrwxrwx root/root usr/lib/libopenjpeg.so.1 -> libopenjpeg.so.1.5.0 +-rwxr-xr-x root/root usr/lib/libopenjpeg.so.1.5.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/libopenjpeg.pc -> libopenjpeg1.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libopenjpeg1.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/openjpeg-1.5/ +-rw-r--r-- root/root usr/share/doc/openjpeg-1.5/CHANGES +-rw-r--r-- root/root usr/share/doc/openjpeg-1.5/LICENSE +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/image_to_j2k.1.gz +-rw-r--r-- root/root usr/share/man/man1/j2k_dump.1.gz +-rw-r--r-- root/root usr/share/man/man1/j2k_to_image.1.gz +lrwxrwxrwx root/root usr/share/man/man1/jpwl_image_to_j2k.1.gz -> image_to_j2k.1.gz +lrwxrwxrwx root/root usr/share/man/man1/jpwl_j2k_to_image.1.gz -> j2k_to_image.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +lrwxrwxrwx root/root usr/share/man/man3/jpwl_libopenjpeg.3.gz -> libopenjpeg.3.gz +-rw-r--r-- root/root usr/share/man/man3/libopenjpeg.3.gz diff --git a/openjpeg/.footprint.x86_64 b/openjpeg/.footprint.x86_64 index fa03c1b41..87fd62eb1 100644 --- a/openjpeg/.footprint.x86_64 +++ b/openjpeg/.footprint.x86_64 @@ -1,8 +1,33 @@ drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/image_to_j2k +-rwxr-xr-x root/root usr/bin/j2k_dump +-rwxr-xr-x root/root usr/bin/j2k_to_image drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/openjpeg.h +drwxr-xr-x root/root usr/include/openjpeg-1.5/ +-rw-r--r-- root/root usr/include/openjpeg-1.5/openjpeg.h +lrwxrwxrwx root/root usr/include/openjpeg.h -> openjpeg-1.5/openjpeg.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libopenjpeg-2.1.3.0.so -rw-r--r-- root/root usr/lib/libopenjpeg.a -lrwxrwxrwx root/root usr/lib/libopenjpeg.so -> libopenjpeg.so.2 -lrwxrwxrwx root/root usr/lib/libopenjpeg.so.2 -> libopenjpeg-2.1.3.0.so +-rwxr-xr-x root/root usr/lib/libopenjpeg.la +lrwxrwxrwx root/root usr/lib/libopenjpeg.so -> libopenjpeg.so.1.5.0 +lrwxrwxrwx root/root usr/lib/libopenjpeg.so.1 -> libopenjpeg.so.1.5.0 +-rwxr-xr-x root/root usr/lib/libopenjpeg.so.1.5.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +lrwxrwxrwx root/root usr/lib/pkgconfig/libopenjpeg.pc -> libopenjpeg1.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libopenjpeg1.pc +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/doc/ +drwxr-xr-x root/root usr/share/doc/openjpeg-1.5/ +-rw-r--r-- root/root usr/share/doc/openjpeg-1.5/CHANGES +-rw-r--r-- root/root usr/share/doc/openjpeg-1.5/LICENSE +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/image_to_j2k.1.gz +-rw-r--r-- root/root usr/share/man/man1/j2k_dump.1.gz +-rw-r--r-- root/root usr/share/man/man1/j2k_to_image.1.gz +lrwxrwxrwx root/root usr/share/man/man1/jpwl_image_to_j2k.1.gz -> image_to_j2k.1.gz +lrwxrwxrwx root/root usr/share/man/man1/jpwl_j2k_to_image.1.gz -> j2k_to_image.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +lrwxrwxrwx root/root usr/share/man/man3/jpwl_libopenjpeg.3.gz -> libopenjpeg.3.gz +-rw-r--r-- root/root usr/share/man/man3/libopenjpeg.3.gz diff --git a/openjpeg/.md5sum.i686 b/openjpeg/.md5sum.i686 index 6d50ec0b4..04b221070 100644 --- a/openjpeg/.md5sum.i686 +++ b/openjpeg/.md5sum.i686 @@ -1,2 +1,3 @@ -2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch -f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz +46d1d26b59ce546444f3fe8d7c685775 openjpeg-1.4-autoconf.patch +e5d66193ddfa59a87da1eb08ea86293b openjpeg-1.5.0.tar.gz +b584f98c991065e097179445cbebb87d zlib-include.patch diff --git a/openjpeg/.md5sum.x86_64 b/openjpeg/.md5sum.x86_64 index 6d50ec0b4..04b221070 100644 --- a/openjpeg/.md5sum.x86_64 +++ b/openjpeg/.md5sum.x86_64 @@ -1,2 +1,3 @@ -2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch -f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz +46d1d26b59ce546444f3fe8d7c685775 openjpeg-1.4-autoconf.patch +e5d66193ddfa59a87da1eb08ea86293b openjpeg-1.5.0.tar.gz +b584f98c991065e097179445cbebb87d zlib-include.patch diff --git a/openjpeg/30_fix_build_for_debian.dpatch b/openjpeg/30_fix_build_for_debian.dpatch deleted file mode 100644 index afd995054..000000000 --- a/openjpeg/30_fix_build_for_debian.dpatch +++ /dev/null @@ -1,70 +0,0 @@ - -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_fix_build_for_debian.dpatch by -## -## 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 - -@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: - diff --git a/openjpeg/Pkgfile b/openjpeg/Pkgfile index eab2f6b65..7d6aaca88 100755 --- a/openjpeg/Pkgfile +++ b/openjpeg/Pkgfile @@ -2,22 +2,22 @@ # URL: http://www.ijg.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: -# Run on: +# Depends on: lcms2 +# Run on: lcms2 name=openjpeg -version=1.3 +version=1.5.0 release=1 -_version=v1_3 -source=( http://www.openjpeg.org/openjpeg_${_version}.tar.gz \ - 30_fix_build_for_debian.dpatch) - +source=(http://openjpeg.googlecode.com/files/openjpeg-$version.tar.gz + openjpeg-1.4-autoconf.patch + zlib-include.patch) build() { - cd OpenJPEG_${_version} - patch -Np1 -i ../30_fix_build_for_debian.dpatch + cd $name-$version +# patch -Np1 -i ../openjpeg-1.4-autoconf.patch +# patch -p0 < ../zlib-include.patch +# rm -rf libs + ./configure --prefix=/usr make make DESTDIR=$PKG install - ln -s libopenjpeg.so.2 $PKG/usr/lib/libopenjpeg.so } - -- cgit v1.2.3-54-g00ecf