rpm/libmng
SHA256
1
0
Fork 0
forked from pool/libmng
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmng?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-07-21 16:02:59 +00:00 committed by Git OBS Bridge
parent ce3dea5806
commit d791d43eb8
7 changed files with 157 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmng-1.0.10.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b1477816c54b4d8ee0690c583982637910a1801ece0b0831e03fd07882e8118
size 852635

26
libmng-1.0.9-dont-leak-zlib-streams.diff
View File

@ -1,13 +1,13 @@
--- libmng_zlib.c
+++ libmng_zlib.c
@@ -162,6 +162,10 @@
#ifdef MNG_SUPPORT_TRACE
MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEINIT, MNG_LC_START);
#endif
+
+ if (pData->bInflating) /* free the old zlib structures */
+ inflateEnd(&pData->sZlib);
+
/* initialize zlib structures and such */
iZrslt = inflateInit (&pData->sZlib);
diff -ur libmng-orig/libmng_zlib.c libmng-1.0.10/libmng_zlib.c
--- libmng_zlib.c 2005-12-15 00:53:13.000000000 +0100
+++ libmng_zlib.c 2007-07-19 13:17:44.000000000 +0200
@@ -162,6 +162,9 @@
#ifdef MNG_SUPPORT_TRACE
MNG_TRACE (pData, MNG_FN_ZLIB_INFLATEINIT, MNG_LC_START);
#endif
+
+ if (pData->bInflating) /* free the old zlib structures */
+ inflateEnd(&pData->sZlib);
/* initialize zlib structures and such */
iZrslt = inflateInit (&pData->sZlib);

3
libmng-1.0.9.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:af1d816bb4eff57ed3725630ec79f9e8c33b2a3d685e3572d8f66c5ef90a33ce
size 412707

53
libmng-no-jpeg.diff
View File

@ -1,29 +1,30 @@
--- makefiles/makefile.linux
+++ makefiles/makefile.linux 2005/02/04 14:32:50
diff -ur libmng-orig/makefiles/makefile.linux libmng-1.0.10/makefiles/makefile.linux
--- makefiles/makefile.linux 2005-01-30 11:28:00.000000000 +0100
+++ makefiles/makefile.linux 2007-07-19 13:39:28.000000000 +0200
@@ -11,7 +11,7 @@
# default build options (this forces shared library compatibility!!)
#OPTIONS = -DMNG_BUILD_SO
-OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS
# default build options (this forces shared library compatibility!!)
#OPTIONS = -DMNG_BUILD_SO
-OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS
+OPTIONS = -DMNG_BUILD_SO -DMNG_NO_INCLUDE_JNG
# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
prefix=/usr
# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
prefix=/usr/local
@@ -50,7 +50,7 @@
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
-L$(LCMSLIB) -Wl,-rpath,$(LCMSLIB) \
- -lmng -lz -ljpeg -llcms -lm
+ -lmng -lz -lm
RANLIB=ranlib
#RANLIB=echo
@@ -107,7 +105,7 @@
# $(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
# $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -L$(LCMSLIB) -lz -lm -lc
$(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
- $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -ljpeg -L$(LCMSLIB) -llcms \
+ $(OBJSDLL) -L$(ZLIBLIB) \
-lz -lm -lc
install: libmng.a libmng.so.$(MNGVER)
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
-L$(LCMSLIB) -Wl,-rpath,$(LCMSLIB) \
- -lmng -lz -ljpeg -llcms -lm
+ -lmng -lz -lm
RANLIB=ranlib
#RANLIB=echo
@@ -107,7 +107,7 @@
# $(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
# $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -L$(LCMSLIB) -lz -lm -lc
$(CC) -shared -Wl,-soname,libmng.so.$(MNGMAJ) -o libmng.so.$(MNGVER) \
- $(OBJSDLL) -L$(ZLIBLIB) -L$(JPEGLIB) -ljpeg -L$(LCMSLIB) -llcms \
+ $(OBJSDLL) -L$(ZLIBLIB) \
-lz -lm -lc
install: libmng.a libmng.so.$(MNGVER)

16
libmng.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jul 19 12:31:15 CEST 2007 - ltinkl@suse.cz
- update to 1.0.10
* fixed some compiler-warnings
* fixed display routines called twice for FULL_MNG support in mozlibmngconf.h
* standard windows dll upgraded to zlib 1.2.3
* fixed problem with CLON object during readdisplay() (thanks Winfried!)
* added typecast to appease the compiler (G R-P)
* added more SKIPCHUNK conditionals (G R-P)
* added MORE MNG_NO_1_2_4BIT_SUPPORT (G R-P)
* added provisional support for anIM(mpNG) proposal
* added provisional support for ANG proposal
- fix patches
- provide %post sections
-------------------------------------------------------------------
Thu Mar 29 11:02:45 CEST 2007 - meissner@suse.de

144
libmng.diff
View File

@ -1,72 +1,78 @@
--- makefiles/makefile.linux
+++ makefiles/makefile.linux 2005/02/01 08:58:48
diff -ur libmng-orig/makefiles/makefile.linux libmng-1.0.10/makefiles/makefile.linux
--- makefiles/makefile.linux 2005-01-30 11:28:00.000000000 +0100
+++ makefiles/makefile.linux 2007-07-19 13:35:44.000000000 +0200
@@ -14,25 +14,25 @@
OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS
# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
-prefix=/usr/local
+prefix=/usr
# Where the zlib library and include files are located
#ZLIBLIB=../zlib
#ZLIBINC=../zlib
-ZLIBLIB=/usr/local/lib
-ZLIBINC=/usr/local/include
+ZLIBLIB=/usr/$(_LIB)
+ZLIBINC=/usr/include
# Where the jpeg library and include files are located
#JPEGLIB=../jpgsrc
#JPEGINC=../jpgsrc
-JPEGLIB=/usr/local/lib
-JPEGINC=/usr/local/include
+JPEGLIB=/usr/$(_LIB)
+JPEGINC=/usr/include
# Where the lcms library and include files are located
#LCMSLIB=../lcms/lib
#LCMSINC=../lcms/source
-LCMSLIB=/usr/local/lib
-LCMSINC=/usr/local/include
+LCMSLIB=/usr/$(_LIB)
+LCMSINC=/usr/include
ALIGN=
# for i386:
OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS
# where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h
-prefix=/usr/local
+prefix=/usr
# Where the zlib library and include files are located
#ZLIBLIB=../zlib
#ZLIBINC=../zlib
-ZLIBLIB=/usr/local/lib
-ZLIBINC=/usr/local/include
+ZLIBLIB=/usr/$(_LIB)
+ZLIBINC=/usr/include
# Where the jpeg library and include files are located
#JPEGLIB=../jpgsrc
#JPEGINC=../jpgsrc
-JPEGLIB=/usr/local/lib
-JPEGINC=/usr/local/include
+JPEGLIB=/usr/$(_LIB)
+JPEGINC=/usr/include
# Where the lcms library and include files are located
#LCMSLIB=../lcms/lib
#LCMSINC=../lcms/source
-LCMSLIB=/usr/local/lib
-LCMSINC=/usr/local/include
+LCMSLIB=/usr/$(_LIB)
+LCMSINC=/usr/include
ALIGN=
# for i386:
@@ -45,7 +45,7 @@
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
- $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
+ $(OPTIONS) $(ALIGN) $(RPM_OPT_FLAGS) -fPIC # $(WARNMORE) -g
LDFLAGS=-L. -Wl,-rpath,. \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
@@ -61,7 +61,7 @@
MNGVER = $(MNGMAJ).$(MNGMIN)
INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
+LIBPATH=$(prefix)/$(_LIB)
OBJS = \
libmng_callback_xs.o \
# for pgcc version 2.95.1, -O3 is buggy; don't use it.
CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \
- $(OPTIONS) $(ALIGN) # $(WARNMORE) -g
+ $(OPTIONS) $(ALIGN) $(RPM_OPT_FLAGS) -fPIC # $(WARNMORE) -g
LDFLAGS=-L. -Wl,-rpath,. \
-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-L$(JPEGLIB) -Wl,-rpath,$(JPEGLIB) \
@@ -57,11 +57,11 @@
# current version numbers
MNGMAJ = 1
-MNGMIN = 1.0.9
+MNGMIN = 1.0.10
MNGVER = $(MNGMAJ).$(MNGMIN)
INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
+LIBPATH=$(prefix)/$(_LIB)
OBJS = \
libmng_callback_xs.o \
@@ -111,13 +111,11 @@
-lz -lm -lc
install: libmng.a libmng.so.$(MNGVER)
- -@mkdir $(INCPATH) $(LIBPATH)
- cp libmng.h libmng_conf.h libmng_types.h $(INCPATH)
- chmod 644 $(INCPATH)/libmng.h $(INCPATH)/libmng_conf.h $(INCPATH)/libmng_types.h
- cp libmng.a libmng.so.$(MNGVER) $(LIBPATH)
- chmod 755 $(LIBPATH)/libmng.so.$(MNGVER)
- -@/bin/rm -f $(LIBPATH)/libmng.so.$(MNGMAJ) $(LIBPATH)/libmng.so
- (cd $(LIBPATH); ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ); \
+ -@mkdir -p $(DESTDIR)$(INCPATH) $(DESTDIR)$(LIBPATH)
+ install -m 0644 libmng.h libmng_conf.h libmng_types.h $(DESTDIR)$(INCPATH)
+ install -m 0755 libmng.a libmng.so.$(MNGVER) $(DESTDIR)$(LIBPATH)
+ -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libmng.so.$(MNGMAJ) $(DESTDIR)$(LIBPATH)/libmng.so
+ (cd $(DESTDIR)$(LIBPATH); ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ); \
ln -sf libmng.so.$(MNGMAJ) libmng.so)
clean:
-lz -lm -lc
install: libmng.a libmng.so.$(MNGVER)
- -@mkdir $(INCPATH) $(LIBPATH)
- cp libmng.h libmng_conf.h libmng_types.h $(INCPATH)
- chmod 644 $(INCPATH)/libmng.h $(INCPATH)/libmng_conf.h $(INCPATH)/libmng_types.h
- cp libmng.a libmng.so.$(MNGVER) $(LIBPATH)
- chmod 755 $(LIBPATH)/libmng.so.$(MNGVER)
- -@/bin/rm -f $(LIBPATH)/libmng.so.$(MNGMAJ) $(LIBPATH)/libmng.so
- (cd $(LIBPATH); ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ); \
+ -@mkdir -p $(DESTDIR)$(INCPATH) $(DESTDIR)$(LIBPATH)
+ install -m 0644 libmng.h libmng_conf.h libmng_types.h $(DESTDIR)$(INCPATH)
+ install -m 0755 libmng.a libmng.so.$(MNGVER) $(DESTDIR)$(LIBPATH)
+ -@/bin/rm -f $(DESTDIR)$(LIBPATH)/libmng.so.$(MNGMAJ) $(DESTDIR)$(LIBPATH)/libmng.so
+ (cd $(DESTDIR)$(LIBPATH); ln -sf libmng.so.$(MNGVER) libmng.so.$(MNGMAJ); \
ln -sf libmng.so.$(MNGMAJ) libmng.so)
clean:

27
libmng.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package libmng (Version 1.0.9)
# spec file for package libmng (Version 1.0.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -12,11 +12,11 @@
Name: libmng
BuildRequires: libjpeg libjpeg-devel liblcms-devel zlib-devel
License: Public Domain, Freeware
License: GPL v2 or later, Other uncritical OpenSource License
Group: System/Libraries
Summary: Library for Support of MNG and JNG Formats
Version: 1.0.9
Release: 47
Version: 1.0.10
Release: 1
URL: http://www.libmng.com/
Source0: libmng-%version.tar.bz2
Patch: libmng.diff
@ -72,6 +72,12 @@ patch -p0 < %PATCH2
make -f makefiles/makefile.linux _LIB=%_lib
install -m 0755 libmng.a $RPM_BUILD_ROOT/%_libdir/libmng-mini.a
%post
%run_ldconfig
%postun
%run_ldconfig
%files
%defattr(-,root,root)
%doc LICENSE README doc/doc.readme doc/libmng.txt
@ -86,6 +92,19 @@ install -m 0755 libmng.a $RPM_BUILD_ROOT/%_libdir/libmng-mini.a
%_libdir/libmng.so
%changelog
* Thu Jul 19 2007 - ltinkl@suse.cz
- update to 1.0.10
* fixed some compiler-warnings
* fixed display routines called twice for FULL_MNG support in mozlibmngconf.h
* standard windows dll upgraded to zlib 1.2.3
* fixed problem with CLON object during readdisplay() (thanks Winfried!)
* added typecast to appease the compiler (G R-P)
* added more SKIPCHUNK conditionals (G R-P)
* added MORE MNG_NO_1_2_4BIT_SUPPORT (G R-P)
* added provisional support for anIM(mpNG) proposal
* added provisional support for ANG proposal
- fix patches
- provide %%post sections
* Thu Mar 29 2007 - meissner@suse.de
- buildrequires zlib-devel
* Tue Oct 24 2006 - ltinkl@suse.cz