Browse Source

Daniel Jahre:


			
			
				rocklinux
			
			
		
Daniel Jahre 21 years ago
parent
commit
694af752fb
7 changed files with 34 additions and 400 deletions
  1. +0
    -49
      package/rene/libtiff/jpeg-zlib.patch
  2. +30
    -0
      package/rene/libtiff/libtiff-shared-lib.patch
  3. +2
    -17
      package/rene/libtiff/libtiff.conf
  4. +2
    -2
      package/rene/libtiff/libtiff.desc
  5. +0
    -154
      package/rene/libtiff/libtiff_configure.patch
  6. +0
    -108
      package/rene/libtiff/makeflags.patch
  7. +0
    -70
      package/rene/libtiff/shlib.patch

+ 0
- 49
package/rene/libtiff/jpeg-zlib.patch

@ -1,49 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libtiff/jpeg-zlib.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./config.site.orig Tue Jul 18 04:09:20 2000
+++ ./config.site Tue Jul 18 04:11:18 2000
@@ -41,8 +41,8 @@
# Package controls.
#
#DSO="auto" # auto|IRIX|IRIX52 enable DSO support for system
-#JPEG="no" # yes|no configure JPEG support (see below)
-#ZIP="no" # yes|no configure Deflate support (see below)
+JPEG="yes" # yes|no configure JPEG support (see below)
+ZIP="yes" # yes|no configure Deflate support (see below)
#LIBGL="auto" # yes|no|auto configure IRIS GL-based tools
#LIBIMAGE="auto" # yes|no|auto configure SGI RGB image tools
#HTML="no" # yes|no install HTML documentation
@@ -96,6 +96,7 @@
#
#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
#DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg
+DIR_JPEGLIB=/usr/lib # directory for libjpeg
#
# Deflate-specific parameters; used when Deflate support is enabled (see above).
@@ -110,7 +111,7 @@
# Look for it also at ftp://ftp.uu.net/pub/archiving/zip/zlib.
#
#DIRS_LIBINC="$DIRS_LIBINC ../zlib" # directory for zlib include files
-#DIR_GZLIB="../zlib" # directory for libz
+DIR_GZLIB="/usr/lib" # directory for libz
#
# Miscellaneous parameters.

+ 30
- 0
package/rene/libtiff/libtiff-shared-lib.patch

@ -0,0 +1,30 @@
diff -ur tiff-3.7.0.orig/ltmain.sh tiff-3.7.0/ltmain.sh
--- ./ltmain.sh 2004-10-14 19:53:25.000000000 +0200
+++ ./ltmain.sh 2004-10-18 14:49:01.000000000 +0200
@@ -2862,7 +2862,7 @@
case $outputname in
lib*)
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
;;
*)
@@ -2874,7 +2874,7 @@
if test "$need_lib_prefix" != no; then
# Add the "lib" prefix for modules if required
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval libname=\"$libname_spec\"
else
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -3637,7 +3637,7 @@
fi
# Get the real and link names of the library.
- eval shared_ext=\"$shrext\"
+ eval shared_ext=\"$shrext_cmds\"
eval library_names=\"$library_names_spec\"
set dummy $library_names
realname="$2"

+ 2
- 17
package/rene/libtiff/libtiff.conf

@ -20,20 +20,5 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
srctar="tiff-v$ver.tar.bz2"
srcdir="tiff-v$ver"
confopt="--noninteractive $arch_target"
pm_libtiff() {
cd libtiff
install -m644 libtiff.so.${ver} $root/usr/lib/
ln -sf ./libtiff.so.${ver} $root/usr/lib/libtiff.so
ln -sf ./libtiff.so.${ver} $root/usr/lib/libtiff.so.3
}
# unexport eval $MAKE (it's confusing configure)
x="$MAKE" ; unset MAKE ; MAKE="$x"
postmake="pm_libtiff"
# thanks to t2 for this one
hook_add preconf 3 "libtoolize -f -c"

+ 2
- 2
package/rene/libtiff/libtiff.desc

@ -39,8 +39,8 @@
[L] OpenSource
[S] Stable
[V] 3.5.7
[V] 3.7.0
[P] X -?---5---9 118.300
[D] 2715801292 tiff-v3.5.7.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/
[D] 3658666879 tiff-3.7.0.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/

+ 0
- 154
package/rene/libtiff/libtiff_configure.patch

@ -1,154 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libtiff/libtiff_configure.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./configure.orig 2001-11-15 19:21:05.000000000 +0200
+++ ./configure 2002-05-17 09:11:51.000000000 +0300
@@ -44,15 +44,15 @@
#
# Setup general configuration parameters.
#
-PREFIX=/usr/local # root of installation
+PREFIX=/usr # root of installation
EPREFIX=${PREFIX}
DIRS_LIBINC= # dirs to search for ancillary includes
DIR_JPEGLIB= # dir for IJG -ljpeg
DIR_GZLIB= # dir for zlib -lgz
DSO=auto # auto-enable DSO support
LIBCOPTS= # library-specific C-compiler options
-JPEG=no # configure JPEG support
-ZIP=no # configure ZIP/Deflate support
+JPEG=yes # configure JPEG support
+ZIP=yes # configure ZIP/Deflate support
PORT=auto # enable portability emulations
HTML=no # install HTML documentation
LIBGL=auto # auto-enable build of SGI -lgl apps
@@ -97,7 +97,7 @@
--verbose opposite of --quiet
--noninteractive don't ask any questions
--version print the version of autoconf that created configure
- --prefix=PREFIX root of installation [PREFIX=/usr/local]
+ --prefix=PREFIX root of installation [PREFIX=/usr]
--exec-prefix=EPREFIX root of installation [EPREFIX=PREFIX]
--target=TARGET configure for TARGET [TARGET=HOST]
--srcdir=DIR find the sources in DIR [configure dir or ..]
@@ -356,7 +356,7 @@
#
case $TARGET in
mips-dec-*) FILLORDER=LSB2MSB;;
- i[345]86-*) FILLORDER=LSB2MSB;;
+ i[3456]86-*) FILLORDER=LSB2MSB;;
*) FILLORDER=MSB2LSB;;
esac
fi
@@ -1355,12 +1355,7 @@
# stripped for pages to be found (only for 4F pages).
#
if [ -z "${DIR_MAN-}" ]; then
- MANPATH="
- $MANPATH
- /usr/local/man
- /usr/contrib/man
- /usr/catman/local
- "
+ MANPATH="/usr/share/man"
DIR_MAN=
for i in $MANPATH; do
test -d $i && { DIR_MAN=$i; break; }
@@ -1372,7 +1367,7 @@
case $TARGET in
*-bsdi*|*-netbsd*) MANSCHEME=bsd-nroff-gzip-0.gz;;
*-freebsd*) MANSCHEME=bsd-source-cat;;
- *-linux*) MANSCHEME=bsd-source-cat;;
+ *-linux*) MANSCHEME=sysv-source-cat;;
*-ultrix*) MANSCHEME=bsd-source-cat;;
*-sunos*) MANSCHEME=bsd-source-cat-strip;;
*-sysv[234]*) MANSCHEME=sysv-source-cat-strip;;
@@ -1389,15 +1384,15 @@
MANSCHEME=sysv-source-cat
if [ -d /usr/share/man ]; then
if [ -d /usr/share/man/u_man ]; then
- MANSCHEME=sysv-source-cat
- elif [ -d /usr/share/man/man8 ]; then
MANSCHEME=bsd-source-cat
+ elif [ -d /usr/share/man/man8 ]; then
+ MANSCHEME=sysv-source-cat
fi
elif [ -d /usr/share/catman ]; then
if [ -d /usr/share/catman/u_man ]; then
- MANSCHEME=sysv-nroff-cat
- elif [ -d /usr/share/catman/man8 ]; then
MANSCHEME=bsd-nroff-cat
+ elif [ -d /usr/share/catman/man8 ]; then
+ MANSCHEME=sysv-nroff-cat
fi
fi
;;
--- ./config.sub.orig Fri Jul 14 20:31:39 2000
+++ ./config.sub Fri Jul 14 20:35:30 2000
@@ -119,7 +119,7 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
+ tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
| powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
@@ -132,7 +132,7 @@
exit 1
;;
# Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+ vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
| sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
@@ -296,19 +296,19 @@
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[345]86v32)
+ i[3456]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv32
;;
- i[345]86v4*)
+ i[3456]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv4
;;
- i[345]86v)
+ i[3456]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv
;;
- i[345]86sol2)
+ i[3456]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-solaris2
;;
@@ -580,7 +580,7 @@
# Each alternative must end in a *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+ | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \

+ 0
- 108
package/rene/libtiff/makeflags.patch

@ -1,108 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libtiff/makeflags.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
Hmmm.... ${MAKEFLAGS} is passed automatically using the environment. However,
I only removed the '-' in front of all the '${MAKEFLAGS}', so the package
build even when we pass CC=.. and CXX=.. (otherwise they would become -C...
which means something enitrely different).
- Clifford
--- ./Makefile.in.orig Fri Jun 28 14:08:49 2002
+++ ./Makefile.in Fri Jun 28 14:08:51 2002
@@ -46,38 +46,38 @@
all default:
@if [ "@PORT@" = yes ]; then \
- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS}; \
+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS}; \
else \
true; \
fi
- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS}
- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS}
- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS}
+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS}
+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS}
+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS}
install:
- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} install
- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} install
- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} install
+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} install
+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} install
+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} install
@if [ "@HTML@" = yes ]; then \
- ${ECHO} "= "html; cd html; ${MAKE} -${MAKEFLAGS} install; \
+ ${ECHO} "= "html; cd html; ${MAKE} ${MAKEFLAGS} install; \
else \
true; \
fi
install-private: install
- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} installPrivateHdrs
+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} installPrivateHdrs
clean:
@if [ "@PORT@" = yes ]; then \
- ${ECHO} "= "port; cd port; ${MAKE} -${MAKEFLAGS} clean; \
+ ${ECHO} "= "port; cd port; ${MAKE} ${MAKEFLAGS} clean; \
else \
true; \
fi
- @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} clean
- @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} clean
- @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} clean
-# -cd contrib/dbs; ${MAKE} -${MAKEFLAGS} clean
-# -cd contrib/dbs/xtiff; ${MAKE} -${MAKEFLAGS} clean
+ @${ECHO} "= "libtiff; cd libtiff; ${MAKE} ${MAKEFLAGS} clean
+ @${ECHO} "= "tools; cd tools; ${MAKE} ${MAKEFLAGS} clean
+ @${ECHO} "= "man; cd man; ${MAKE} ${MAKEFLAGS} clean
+# -cd contrib/dbs; ${MAKE} ${MAKEFLAGS} clean
+# -cd contrib/dbs/xtiff; ${MAKE} ${MAKEFLAGS} clean
clobber distclean: clean
rm -f Makefile libtiff/port.h config.log
@@ -100,7 +100,7 @@
product::
test -d dist || mkdir dist
rm -f dist/rawidb
- SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} -${MAKEFLAGS} install installLink
+ SRC=`pwd` RAWIDB=`pwd`/dist/rawidb ${MAKE} ${MAKEFLAGS} install installLink
rm -f dist/idb
sort -u +4 dist/rawidb > dist/idb
${GENDIST} -v -dist dist -idb dist/idb \
@@ -498,11 +498,11 @@
release:
(cd ${SRCDIR}/dist; sh newversion)
- ${MAKE} -${MAKEFLAGS} release.stamp
- (cd ${SRCDIR}/libtiff; ${MAKE} -${MAKEFLAGS} tiffvers.h)
+ ${MAKE} ${MAKEFLAGS} release.stamp
+ (cd ${SRCDIR}/libtiff; ${MAKE} ${MAKEFLAGS} tiffvers.h)
# ${SRCDIR}/configure ${CONFIG}
-# ${MAKE} -${MAKEFLAGS} product
- ${MAKE} -${MAKEFLAGS} release.tar.zip
+# ${MAKE} ${MAKEFLAGS} product
+ ${MAKE} ${MAKEFLAGS} release.tar.zip
# stamp relevant files according to current alpha

+ 0
- 70
package/rene/libtiff/shlib.patch

@ -1,70 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libtiff/shlib.patch
# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./libtiff/Makefile.in.orig Tue Jul 18 03:24:57 2000
+++ ./libtiff/Makefile.in Tue Jul 18 03:28:40 2000
@@ -64,6 +64,8 @@
COPTS = @GCOPTS@
OPTIMIZER=-O
CFLAGS = @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
+SONAME = libtiff.so.3
+SHLIB = libtiff.so.3.5.7
#
SRCS = \
tif_aux.c \
@@ -135,7 +137,8 @@
tif_write.o \
tif_zip.o \
${NULL}
-TARGETS = libtiff.a
+TARGETS = libtiff.a $(SHLIB)
+SHOBJS= $(OBJS:%.o=%.so)
all: ${TARGETS}
if [ @DSO@dso != nodso ]; then \
@@ -148,6 +151,9 @@
${AR} ${AROPTS} libtiff.a $?
${RANLIB} libtiff.a
+$(SHLIB): $(SHOBJS)
+ gcc -o $(SHLIB) -Wl,-soname,$(SONAME) -shared $(SHOBJS) -ljpeg -lz
+
#
# NB: The configure script verifies that the configured
# tools are capable of producing a DSO before enabling
@@ -346,3 +352,5 @@
mkg3states tif_fax3sm.c \
mkversion version.h \
libtiff.a libtiff.@DSOSUF@ libtiff.@DSOSUF_VERSION@ *dso
+%.so : %.c
+ $(CC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $< -o $@
--- ./tools/Makefile.in.orig Tue Jul 18 03:29:05 2000
+++ ./tools/Makefile.in Tue Jul 18 03:30:06 2000
@@ -48,9 +48,10 @@
CFLAGS = @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
#
TIFFLIB = ${DEPTH}/libtiff/libtiff.@DSOSUF@
+TIFFLIB = ${DEPTH}/libtiff/libtiff.so.3.5.7
LIBJPEG = @LIBJPEG@
LIBGZ = @LIBGZ@
-LIBTIFF = @TIFFLIBREF@
+LIBTIFF = -L${DEPTH}/libtiff -ltiff
LIBPORT = @LIBPORT@
MACHLIBS= @MACHDEPLIBS@
LIBS = ${LIBTIFF} ${LIBJPEG} ${LIBGZ} ${LIBPORT} ${MACHLIBS}

Loading…
Cancel
Save