libpng: updated to 1.2.10, switched to the configure script

This commit is contained in:
Tilman Sauerbeck 2006-05-14 13:32:39 +00:00
parent c96b484185
commit e55b42d923
4 changed files with 17 additions and 60 deletions

View File

@ -3,7 +3,6 @@ drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/libpng-config -> libpng12-config
-rwxr-xr-x root/root usr/bin/libpng12-config
drwxr-xr-x root/root usr/include/
lrwxrwxrwx root/root usr/include/libpng -> libpng12
drwxr-xr-x root/root usr/include/libpng12/
-rw-r--r-- root/root usr/include/libpng12/png.h
-rw-r--r-- root/root usr/include/libpng12/pngconf.h
@ -11,13 +10,15 @@ lrwxrwxrwx root/root usr/include/png.h -> libpng12/png.h
lrwxrwxrwx root/root usr/include/pngconf.h -> libpng12/pngconf.h
drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libpng.a -> libpng12.a
lrwxrwxrwx root/root usr/lib/libpng.so -> libpng.so.3
lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.1.2.8
-rwxr-xr-x root/root usr/lib/libpng.so.3.1.2.8
lrwxrwxrwx root/root usr/lib/libpng.la -> libpng12.la
lrwxrwxrwx root/root usr/lib/libpng.so -> libpng12.so
lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.10.0
-rwxr-xr-x root/root usr/lib/libpng.so.3.10.0
-rw-r--r-- root/root usr/lib/libpng12.a
lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0
lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.1.2.8
-rwxr-xr-x root/root usr/lib/libpng12.so.0.1.2.8
-rwxr-xr-x root/root usr/lib/libpng12.la
lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0.10.0
lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.10.0
-rwxr-xr-x root/root usr/lib/libpng12.so.0.10.0
drwxr-xr-x root/root usr/lib/pkgconfig/
lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng12.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpng12.pc

View File

@ -1,2 +1 @@
c3ec821096773a0b37ad7b951e5ef053 libpng-1.2.8.patch
00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2
4f23eebd59ddd01a8f91ff8c823dd7d6 libpng-1.2.10.tar.bz2

View File

@ -4,15 +4,15 @@
# Depends on: zlib
name=libpng
version=1.2.8
version=1.2.10
release=1
source=(http://dl.sourceforge.net/libpng/$name-$version.tar.bz2 \
$name-$version.patch)
source=(ftp://ftp.simplesystems.org/pub/$name/png/src/$name-$version.tar.bz2)
build() {
cd $name-$version
patch -p1 < ../$name-$version.patch
cp scripts/makefile.gcmmx makefile
mkdir $PKG/usr
make DESTDIR=$PKG prefix=/usr install
cd $name-$version
./configure --prefix=/usr
make
make DESTDIR=$PKG install
}

View File

@ -1,43 +0,0 @@
diff -ru libpng-1.2.5/scripts/makefile.gcmmx libpng-1.2.5-new/scripts/makefile.gcmmx
--- libpng-1.2.5/scripts/makefile.gcmmx 2002-10-03 13:32:34.000000000 +0200
+++ libpng-1.2.5-new/scripts/makefile.gcmmx 2003-02-05 20:54:36.000000000 +0100
@@ -28,8 +28,8 @@
# Where the zlib library and include files are located.
#ZLIBLIB=/usr/local/lib
#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/lib
+ZLIBINC=/usr/include
ALIGN=
# for i386:
@@ -43,13 +43,13 @@
# Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
### for generic gcc:
-CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
- -O3 $(ALIGN) -funroll-loops \
- -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5
+#CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \
+# -O3 $(ALIGN) -funroll-loops \
+# -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5
### for gcc 2.95.2 on 686:
-#CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
-# -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \
-# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
+CFLAGS+=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
+ -malign-double -ffast-math -fstrict-aliasing \
+ $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
### for gcc 2.7.2.3 on 486 and up:
#CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
# -m486 -malign-double -ffast-math \
@@ -131,7 +131,7 @@
libpng.so.3.$(PNGMIN): $(OBJSDLL)
$(CC) -shared -Wl,-soname,libpng.so.3 \
- -o libpng.so.3.$(PNGMIN) \
+ -L$(ZLIBLIB) -lm -lz -o libpng.so.3.$(PNGMIN) \
$(OBJSDLL)
pngtest: pngtest.o $(LIBNAME).so