From acd7c2e639607fe59d32869cc9931571a300f8ed Mon Sep 17 00:00:00 2001 From: sibel Date: Wed, 25 May 2011 07:00:22 +0200 Subject: openjpeg dans base --- base/openjpeg/.footprint.i686 | 8 +++ base/openjpeg/.footprint.x86_64 | 8 +++ base/openjpeg/.md5sum.i686 | 2 + base/openjpeg/.md5sum.x86_64 | 2 + base/openjpeg/30_fix_build_for_debian.dpatch | 70 +++++++++++++++++++++++++++ base/openjpeg/Pkgfile | 23 +++++++++ extra/openjpeg/.footprint.i686 | 8 --- extra/openjpeg/.footprint.x86_64 | 8 --- extra/openjpeg/.md5sum.i686 | 2 - extra/openjpeg/.md5sum.x86_64 | 2 - extra/openjpeg/30_fix_build_for_debian.dpatch | 70 --------------------------- extra/openjpeg/Pkgfile | 23 --------- 12 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 base/openjpeg/.footprint.i686 create mode 100644 base/openjpeg/.footprint.x86_64 create mode 100644 base/openjpeg/.md5sum.i686 create mode 100644 base/openjpeg/.md5sum.x86_64 create mode 100644 base/openjpeg/30_fix_build_for_debian.dpatch create mode 100755 base/openjpeg/Pkgfile delete mode 100644 extra/openjpeg/.footprint.i686 delete mode 100644 extra/openjpeg/.footprint.x86_64 delete mode 100644 extra/openjpeg/.md5sum.i686 delete mode 100644 extra/openjpeg/.md5sum.x86_64 delete mode 100644 extra/openjpeg/30_fix_build_for_debian.dpatch delete mode 100755 extra/openjpeg/Pkgfile diff --git a/base/openjpeg/.footprint.i686 b/base/openjpeg/.footprint.i686 new file mode 100644 index 000000000..fa03c1b41 --- /dev/null +++ b/base/openjpeg/.footprint.i686 @@ -0,0 +1,8 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/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 diff --git a/base/openjpeg/.footprint.x86_64 b/base/openjpeg/.footprint.x86_64 new file mode 100644 index 000000000..fa03c1b41 --- /dev/null +++ b/base/openjpeg/.footprint.x86_64 @@ -0,0 +1,8 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/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 diff --git a/base/openjpeg/.md5sum.i686 b/base/openjpeg/.md5sum.i686 new file mode 100644 index 000000000..6d50ec0b4 --- /dev/null +++ b/base/openjpeg/.md5sum.i686 @@ -0,0 +1,2 @@ +2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch +f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz diff --git a/base/openjpeg/.md5sum.x86_64 b/base/openjpeg/.md5sum.x86_64 new file mode 100644 index 000000000..6d50ec0b4 --- /dev/null +++ b/base/openjpeg/.md5sum.x86_64 @@ -0,0 +1,2 @@ +2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch +f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz diff --git a/base/openjpeg/30_fix_build_for_debian.dpatch b/base/openjpeg/30_fix_build_for_debian.dpatch new file mode 100644 index 000000000..afd995054 --- /dev/null +++ b/base/openjpeg/30_fix_build_for_debian.dpatch @@ -0,0 +1,70 @@ + +#! /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/base/openjpeg/Pkgfile b/base/openjpeg/Pkgfile new file mode 100755 index 000000000..eab2f6b65 --- /dev/null +++ b/base/openjpeg/Pkgfile @@ -0,0 +1,23 @@ +# Description: Librairie libre codec jpeg 2000 +# URL: http://www.ijg.org/ +# Maintainer: NuTyX core team +# Packager: thierryn1 at hispeed dot ch +# Depends on: +# Run on: + +name=openjpeg +version=1.3 +release=1 +_version=v1_3 +source=( http://www.openjpeg.org/openjpeg_${_version}.tar.gz \ + 30_fix_build_for_debian.dpatch) + + +build() { + cd OpenJPEG_${_version} + patch -Np1 -i ../30_fix_build_for_debian.dpatch + make + make DESTDIR=$PKG install + ln -s libopenjpeg.so.2 $PKG/usr/lib/libopenjpeg.so +} + diff --git a/extra/openjpeg/.footprint.i686 b/extra/openjpeg/.footprint.i686 deleted file mode 100644 index fa03c1b41..000000000 --- a/extra/openjpeg/.footprint.i686 +++ /dev/null @@ -1,8 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/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 diff --git a/extra/openjpeg/.footprint.x86_64 b/extra/openjpeg/.footprint.x86_64 deleted file mode 100644 index fa03c1b41..000000000 --- a/extra/openjpeg/.footprint.x86_64 +++ /dev/null @@ -1,8 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/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 diff --git a/extra/openjpeg/.md5sum.i686 b/extra/openjpeg/.md5sum.i686 deleted file mode 100644 index 6d50ec0b4..000000000 --- a/extra/openjpeg/.md5sum.i686 +++ /dev/null @@ -1,2 +0,0 @@ -2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch -f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz diff --git a/extra/openjpeg/.md5sum.x86_64 b/extra/openjpeg/.md5sum.x86_64 deleted file mode 100644 index 6d50ec0b4..000000000 --- a/extra/openjpeg/.md5sum.x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -2557f485513e77f6dcea77f4741c4fa1 30_fix_build_for_debian.dpatch -f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz diff --git a/extra/openjpeg/30_fix_build_for_debian.dpatch b/extra/openjpeg/30_fix_build_for_debian.dpatch deleted file mode 100644 index afd995054..000000000 --- a/extra/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/extra/openjpeg/Pkgfile b/extra/openjpeg/Pkgfile deleted file mode 100755 index eab2f6b65..000000000 --- a/extra/openjpeg/Pkgfile +++ /dev/null @@ -1,23 +0,0 @@ -# Description: Librairie libre codec jpeg 2000 -# URL: http://www.ijg.org/ -# Maintainer: NuTyX core team -# Packager: thierryn1 at hispeed dot ch -# Depends on: -# Run on: - -name=openjpeg -version=1.3 -release=1 -_version=v1_3 -source=( http://www.openjpeg.org/openjpeg_${_version}.tar.gz \ - 30_fix_build_for_debian.dpatch) - - -build() { - cd OpenJPEG_${_version} - patch -Np1 -i ../30_fix_build_for_debian.dpatch - make - make DESTDIR=$PKG install - ln -s libopenjpeg.so.2 $PKG/usr/lib/libopenjpeg.so -} - -- cgit v1.2.3-70-g09d2