- shared lib

Changed files:
    crossmingw32-libjpeg-shared.patch -> 1.1
    crossmingw32-libjpeg.spec -> 1.3

diff --git a/crossmingw32-libjpeg-shared.patch b/crossmingw32-libjpeg-shared.patch
new file mode 100644 (file)
index 0000000..90bb74f
--- /dev/null
+++ b/crossmingw32-libjpeg-shared.patch
@@ -0,0 +1,13 @@
+diff -ruN jpeg-6b./makefile.cfg jpeg-6b/makefile.cfg
+--- jpeg-6b./makefile.cfg      2003-12-25 03:23:00.000000000 +0100
++++ jpeg-6b/makefile.cfg       2003-12-25 03:26:30.147554616 +0100
+@@ -166,6 +166,9 @@
+       $(AR) libjpeg.a  $(LIBOBJECTS)
+       $(AR2) libjpeg.a
+ 
++jpeg.dll: $(LIBOBJECTS)
++      $(CC) $(LIBOBJECTS) -shared -Wl,--enable-auto-image-base -o jpeg.dll -Wl,--out-implib,libjpeg.dll.a
++
+ # with libtool:
+ libjpeg.la:  $(LIBOBJECTS)
+       $(LIBTOOL) --mode=link $(CC) -o libjpeg.la $(LIBOBJECTS) \

diff --git a/crossmingw32-libjpeg.spec b/crossmingw32-libjpeg.spec
index f5dbf39799233773d41807d18c93ac63b8776662..edbb94d766b0154ec8d6cda6eff35d9083645a28 100644 (file)
--- a/crossmingw32-libjpeg.spec
+++ b/crossmingw32-libjpeg.spec
@@ -11,6 +11,7 @@ Source0:      ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
 Patch0:                %{realname}-DESTDIR.patch
 Patch1:                %{realname}-include.patch
 Patch2:                %{realname}-c++.patch
 Patch0:                %{realname}-DESTDIR.patch
 Patch1:                %{realname}-include.patch
 Patch2:                %{realname}-c++.patch

+Patch3:                %{name}-shared.patch

 URL:           http://www.ijg.org/
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-w32api
 URL:           http://www.ijg.org/
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-w32api


@@ -35,11 +36,23 @@ JPEG images.
 %description -l pl
 Ten pakiet zawiera bibliotekê funkcji do manipulacji plikami jpeg.
 
 %description -l pl
 Ten pakiet zawiera bibliotekê funkcji do manipulacji plikami jpeg.
 

+%package dll
+Summary:       libjpeg - DLL library for Windows
+Summary(pl):   libjpeg - biblioteka DLL dla Windows
+Group:         Applications/Emulators
+
+%description dll
+libjpeg - DLL library for Windows.
+
+%description dll -l pl
+libjpeg - biblioteka DLL dla Windows.
+

 %prep
 %setup -q -n jpeg-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %prep
 %setup -q -n jpeg-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

+%patch3 -p1

 
 %build
 CC=%{target}-gcc ; export CC
 
 %build
 CC=%{target}-gcc ; export CC


@@ -60,15 +73,19 @@ TARGET="%{target}" ; export TARGET
        --prefix=%{arch}
 
 %{__make}
        --prefix=%{arch}
 
 %{__make}

+%{__make} jpeg.dll
+
+%{target}-strip jpeg.dll
+%{target}-strip -g -R.comment -R.note *.a

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{arch}/{include,lib}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{arch}/{include,lib}

+install -d $RPM_BUILD_ROOT%{_datadir}/wine/windows/system

 
 

-%{target}-strip -g -R.comment -R.note libjpeg.a
-
-install libjpeg.a $RPM_BUILD_ROOT%{arch}/lib

 install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{arch}/include
 install jconfig.h jerror.h jmorecfg.h jpeglib.h jversion.h $RPM_BUILD_ROOT%{arch}/include

+install *.a $RPM_BUILD_ROOT%{arch}/lib
+install jpeg.dll $RPM_BUILD_ROOT%{_datadir}/wine/windows/system

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -77,3 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{arch}/include/*
 %{arch}/lib/*
 %defattr(644,root,root,755)
 %{arch}/include/*
 %{arch}/lib/*

+
+%files dll
+%defattr(644,root,root,755)
+%{_datadir}/wine/windows/system/*