1
--- libpng-1.2.41.orig/Makefile.in
2
+++ libpng-1.2.41/Makefile.in
3
@@ -408,7 +408,7 @@ config.h: stamp-h1
4
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
6
cd $(top_builddir) && $(SHELL) ./config.status config.h
7
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
8
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
9
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
12
@@ -450,9 +450,9 @@ clean-libLTLIBRARIES:
13
echo "rm -f \"$${dir}/so_locations\""; \
14
rm -f "$${dir}/so_locations"; \
16
-libpng.la: $(libpng_la_OBJECTS) $(libpng_la_DEPENDENCIES)
17
+libpng.la: $(libpng_la_OBJECTS) $(libpng_la_DEPENDENCIES)
18
$(libpng_la_LINK) $(libpng_la_OBJECTS) $(libpng_la_LIBADD) $(LIBS)
19
-libpng12.la: $(libpng12_la_OBJECTS) $(libpng12_la_DEPENDENCIES)
20
+libpng12.la: $(libpng12_la_OBJECTS) $(libpng12_la_DEPENDENCIES)
21
$(libpng12_la_LINK) -rpath $(libdir) $(libpng12_la_OBJECTS) $(libpng12_la_LIBADD) $(LIBS)
24
@@ -463,7 +463,7 @@ clean-checkPROGRAMS:
25
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
26
echo " rm -f" $$list; \
28
-pngtest$(EXEEXT): $(pngtest_OBJECTS) $(pngtest_DEPENDENCIES)
29
+pngtest$(EXEEXT): $(pngtest_OBJECTS) $(pngtest_DEPENDENCIES)
30
@rm -f pngtest$(EXEEXT)
31
$(LINK) $(pngtest_OBJECTS) $(pngtest_LDADD) $(LIBS)
32
install-binSCRIPTS: $(bin_SCRIPTS)
33
--- libpng-1.2.41.orig/aclocal.m4
34
+++ libpng-1.2.41/aclocal.m4
35
@@ -2460,7 +2460,7 @@ linux*oldld* | linux*aout* | linux*coff*
38
# This must be Linux ELF.
40
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
44
@@ -2500,6 +2500,18 @@ linux* | k*bsd*-gnu)
45
dynamic_linker='GNU/Linux ld.so'
52
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
53
+ soname_spec='${libname}${release}${shared_ext}$major'
54
+ shlibpath_var=LD_LIBRARY_PATH
55
+ shlibpath_overrides_runpath=no
56
+ hardcode_into_libs=yes
57
+ dynamic_linker='NetBSD ld.elf_so'
63
@@ -3087,11 +3099,11 @@ irix5* | irix6* | nonstopux*)
66
# This must be Linux ELF.
68
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
69
lt_cv_deplibs_check_method=pass_all
73
+netbsd* | netbsdelf*-gnu)
74
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
75
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
77
@@ -3708,7 +3720,7 @@ m4_if([$1], [CXX], [
81
- linux* | k*bsd*-gnu)
82
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
86
@@ -3772,7 +3784,7 @@ m4_if([$1], [CXX], [
91
+ netbsd* | netbsdelf*-gnu)
94
# QNX uses GNU C++, but need to define -shared option too, otherwise
95
@@ -3992,7 +4004,7 @@ m4_if([$1], [CXX], [
96
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
99
- linux* | k*bsd*-gnu)
100
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
102
# old Intel for x86_64 which still supported -KPIC.
104
@@ -4197,6 +4209,9 @@ m4_if([$1], [CXX], [
105
cygwin* | mingw* | cegcc*)
106
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
108
+ linux* | k*bsd*-gnu)
109
+ _LT_TAGVAR(link_all_deplibs, $1)=no
112
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
114
@@ -4261,6 +4276,9 @@ dnl Note also adjust exclude_expsyms for
118
+ linux* | k*bsd*-gnu)
119
+ _LT_TAGVAR(link_all_deplibs, $1)=no
123
_LT_TAGVAR(ld_shlibs, $1)=yes
124
@@ -4282,6 +4300,7 @@ dnl Note also adjust exclude_expsyms for
126
supports_anon_versioning=no
127
case `$LD -v 2>&1` in
128
+ *GNU\ gold*) supports_anon_versioning=yes ;;
129
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
130
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
131
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
132
@@ -4373,7 +4392,7 @@ _LT_EOF
133
_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
136
- gnu* | linux* | tpf* | k*bsd*-gnu)
137
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
139
if test "$host_os" = linux-dietlibc; then
141
@@ -4443,7 +4462,7 @@ _LT_EOF
146
+ netbsd* | netbsdelf*-gnu)
147
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
148
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
150
@@ -4618,6 +4637,7 @@ _LT_EOF
151
if test "$aix_use_runtimelinking" = yes; then
152
shared_flag="$shared_flag "'${wl}-G'
154
+ _LT_TAGVAR(link_all_deplibs, $1)=no
157
if test "$host_cpu" = ia64; then
158
@@ -4856,7 +4876,7 @@ _LT_EOF
159
_LT_TAGVAR(link_all_deplibs, $1)=yes
163
+ netbsd* | netbsdelf*-gnu)
164
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
165
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
167
@@ -5852,7 +5872,7 @@ if test "$_lt_caught_CXX_error" != yes;
168
_LT_TAGVAR(inherit_rpath, $1)=yes
171
- linux* | k*bsd*-gnu)
172
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
175
# Kuck and Associates, Inc. (KAI) C++ Compiler
176
--- libpng-1.2.41.orig/ltmain.sh
177
+++ libpng-1.2.41/ltmain.sh
180
# compiler flags: $LTCFLAGS
181
# linker: $LD (gnu? $with_gnu_ld)
182
-# $progname: (GNU libtool) 2.2.6b
183
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
184
# automake: $automake_version
185
# autoconf: $autoconf_version
192
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
194
package_revision=1.3017
196
@@ -5033,7 +5033,10 @@ func_mode_link ()
198
dlopen) libs="$dlfiles" ;;
199
dlpreopen) libs="$dlprefiles" ;;
200
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
202
+ libs="$deplibs %DEPLIBS%"
203
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
207
if test "$linkmode,$pass" = "lib,dlpreopen"; then
208
@@ -5344,19 +5347,19 @@ func_mode_link ()
209
# It is a libtool convenience library, so add in its objects.
210
convenience="$convenience $ladir/$objdir/$old_library"
211
old_convenience="$old_convenience $ladir/$objdir/$old_library"
213
+ for deplib in $dependency_libs; do
214
+ deplibs="$deplib $deplibs"
215
+ if $opt_duplicate_deps ; then
216
+ case "$tmp_libs " in
217
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
220
+ tmp_libs="$tmp_libs $deplib"
222
elif test "$linkmode" != prog && test "$linkmode" != lib; then
223
func_fatal_error "\`$lib' is not a convenience library"
226
- for deplib in $dependency_libs; do
227
- deplibs="$deplib $deplibs"
228
- if $opt_duplicate_deps ; then
229
- case "$tmp_libs " in
230
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
233
- tmp_libs="$tmp_libs $deplib"
238
@@ -5893,6 +5896,7 @@ func_mode_link ()
239
if test "$link_all_deplibs" != no; then
240
# Add the search paths of all dependency libraries
241
for deplib in $dependency_libs; do
244
-L*) path="$deplib" ;;
246
@@ -6206,6 +6210,9 @@ func_mode_link ()
247
revision="$number_minor"
251
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
256
--- libpng-1.2.41.orig/configure
257
+++ libpng-1.2.41/configure
258
@@ -5613,11 +5613,11 @@ irix5* | irix6* | nonstopux*)
261
# This must be Linux ELF.
262
-linux* | k*bsd*-gnu)
263
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
264
lt_cv_deplibs_check_method=pass_all
268
+netbsd* | netbsdelf*-gnu)
269
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
270
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
272
@@ -7909,7 +7909,7 @@ $as_echo_n "checking for $compiler optio
273
lt_prog_compiler_static='-non_shared'
276
- linux* | k*bsd*-gnu)
277
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
279
# old Intel for x86_64 which still supported -KPIC.
281
@@ -8358,6 +8358,9 @@ $as_echo_n "checking whether the $compil
285
+ linux* | k*bsd*-gnu)
286
+ link_all_deplibs=no
291
@@ -8379,6 +8382,7 @@ $as_echo_n "checking whether the $compil
293
supports_anon_versioning=no
294
case `$LD -v 2>&1` in
295
+ *GNU\ gold*) supports_anon_versioning=yes ;;
296
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
297
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
298
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
299
@@ -8470,7 +8474,7 @@ _LT_EOF
300
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
303
- gnu* | linux* | tpf* | k*bsd*-gnu)
304
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
306
if test "$host_os" = linux-dietlibc; then
308
@@ -8540,7 +8544,7 @@ _LT_EOF
313
+ netbsd* | netbsdelf*-gnu)
314
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
315
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
317
@@ -8715,6 +8719,7 @@ _LT_EOF
318
if test "$aix_use_runtimelinking" = yes; then
319
shared_flag="$shared_flag "'${wl}-G'
321
+ link_all_deplibs=no
324
if test "$host_cpu" = ia64; then
325
@@ -9041,7 +9046,7 @@ rm -f core conftest.err conftest.$ac_obj
330
+ netbsd* | netbsdelf*-gnu)
331
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
332
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
334
@@ -9931,7 +9936,7 @@ linux*oldld* | linux*aout* | linux*coff*
337
# This must be Linux ELF.
338
-linux* | k*bsd*-gnu)
339
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
343
@@ -9986,6 +9991,18 @@ rm -f core conftest.err conftest.$ac_obj
344
dynamic_linker='GNU/Linux ld.so'
351
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
352
+ soname_spec='${libname}${release}${shared_ext}$major'
353
+ shlibpath_var=LD_LIBRARY_PATH
354
+ shlibpath_overrides_runpath=no
355
+ hardcode_into_libs=yes
356
+ dynamic_linker='NetBSD ld.elf_so'
362
@@ -10606,7 +10623,7 @@ else
363
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
364
lt_status=$lt_dlunknown
365
cat > conftest.$ac_ext <<_LT_EOF
366
-#line 10609 "configure"
367
+#line 10626 "configure"
368
#include "confdefs.h"
371
@@ -10702,7 +10719,7 @@ else
372
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
373
lt_status=$lt_dlunknown
374
cat > conftest.$ac_ext <<_LT_EOF
375
-#line 10705 "configure"
376
+#line 10722 "configure"
377
#include "confdefs.h"