+++ /dev/null
-missing patch 'libpng-multilib.patch'
+++ /dev/null
-Use pkg-config to report libpng version and installation directories.
-
-
-diff -Naur libpng-1.2.31.orig/scripts/libpng-config.in libpng-1.2.31/scripts/libpng-config.in
---- libpng-1.2.31.orig/scripts/libpng-config.in 2008-05-29 13:37:58.000000000 -0400
-+++ libpng-1.2.31/scripts/libpng-config.in 2008-08-23 16:57:20.000000000 -0400
-@@ -8,11 +8,11 @@
-
- # Modeled after libxml-config.
-
--version="@PNGLIB_VERSION@"
--prefix="@prefix@"
--exec_prefix="@exec_prefix@"
--libdir="@libdir@"
--includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
-+version=`pkg-config --modversion libpng`
-+prefix=`pkg-config --variable prefix libpng`
-+exec_prefix=`pkg-config --variable exec_prefix libpng`
-+libdir=`pkg-config --variable libdir libpng`
-+includedir=`pkg-config --variable includedir libpng`
- libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
- all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
- I_opts="-I${includedir}"
+++ /dev/null
-diff -Naur libpng-1.2.29.orig/configure.ac libpng-1.2.29/configure.ac
---- libpng-1.2.29.orig/configure.ac 2008-05-08 07:58:11.000000000 -0400
-+++ libpng-1.2.29/configure.ac 2008-05-31 20:21:12.000000000 -0400
-@@ -63,7 +63,8 @@
- AC_MSG_CHECKING(
- [if assembler code in pnggccrd.c can be compiled without PNG_NO_MMX_CODE])
- AC_TRY_COMPILE(
-- [#include "$srcdir/pnggccrd.c"],
-+ [#define PNG_CONFIGURE_LIBPNG
-+ #include "$srcdir/pnggccrd.c"],
- [return 0;],
- AC_MSG_RESULT(yes)
- LIBPNG_NO_MMX="",
-diff -Naur libpng-1.2.29.orig/pngconf.h libpng-1.2.29/pngconf.h
---- libpng-1.2.29.orig/pngconf.h 2008-05-08 07:58:03.000000000 -0400
-+++ libpng-1.2.29/pngconf.h 2008-05-31 20:21:12.000000000 -0400
-@@ -35,6 +35,25 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-+#else
-+/* pngconf.h is part of the exported API. When a libpng-using application
-+ includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have
-+ libpng's config.h available in this case. This means that we do not have the
-+ defines added to config.h and the commandline by libpng's ./configure .
-+
-+ For all defines from config.h not having them set is not a problem, however
-+ ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling
-+ on a platform on which the MMX and SSE asm code in libpng is not supported.
-+
-+ We do need this define as this define is used to determine whether or not
-+ to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines
-+ and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications
-+ (ImageMagick for example) to determine whether or not they can use the asm
-+ functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms
-+ on which the MMX and SSE asm code in libpng is not supported: */
-+#ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */
-+#define PNG_NO_ASSEMBLER_CODE
-+#endif
- #endif
-
- /*
+++ /dev/null
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-
-Name: mingw32-libpng
-Version: 1.2.34
-Release: 2%{?dist}
-Summary: MinGW Windows Libpng library
-
-License: zlib
-URL: http://www.libpng.org/pub/png/
-Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng-%{version}.tar.bz2
-Patch0: libpng-multilib.patch
-Patch1: libpng-pngconf.patch
-
-Group: Development/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-BuildRequires: mingw32-filesystem >= 40
-BuildRequires: mingw32-gcc
-BuildRequires: mingw32-binutils
-BuildRequires: mingw32-zlib
-
-Requires: pkgconfig
-
-%description
-MinGW Windows Libpng library.
-
-
-%prep
-%setup -q -n libpng-%{version}
-%patch0 -p1
-%patch1 -p1
-
-%build
-%{_mingw32_configure}
-make
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make DESTDIR=$RPM_BUILD_ROOT install
-
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libpng.a
-
-# No need to distribute manpages which appear in the Fedora
-# native packages already.
-rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%doc ANNOUNCE CHANGES KNOWNBUG LICENSE README TODO Y2KINFO
-%{_mingw32_bindir}/libpng-3.dll
-%{_mingw32_bindir}/libpng-config
-%{_mingw32_bindir}/libpng12-0.dll
-%{_mingw32_bindir}/libpng12-config
-%{_mingw32_includedir}/libpng12
-%{_mingw32_includedir}/png.h
-%{_mingw32_includedir}/pngconf.h
-%{_mingw32_libdir}/libpng.dll.a
-%{_mingw32_libdir}/libpng.la
-%{_mingw32_libdir}/libpng12.a
-%{_mingw32_libdir}/libpng12.dll.a
-%{_mingw32_libdir}/libpng12.la
-%{_mingw32_libdir}/pkgconfig/libpng.pc
-%{_mingw32_libdir}/pkgconfig/libpng12.pc
-
-
-%changelog
-* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 1.2.34-2
-- Depend on mingw32-filesystem >= 40 so we can still build in F-10.
-
-* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 1.2.34-1
-- Rebase to 1.2.34 and patches from Fedora.
-- Requires pkgconfig.
-- Add documentation.
-
-* Wed Sep 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-5
-- Rename mingw -> mingw32.
-
-* Mon Sep 22 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-4
-- Add patches from rawhide RPM
-
-* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-3
-- Don't duplicate Fedora native manpages.
-
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.31-2
-- Remove static library.
-
-* Tue Sep 9 2008 Daniel P. Berrange <berrange@redhat.com> - 1.2.31-1
-- Initial RPM release
+++ /dev/null
---- pthreads-w32-2-8-0-release/tests/GNUmakefile.wine 2008-10-10 14:19:06.000000000 +0100
-+++ pthreads-w32-2-8-0-release/tests/GNUmakefile 2008-10-10 14:19:40.000000000 +0100
-@@ -87,7 +87,7 @@
- mutex6s mutex6es mutex6rs \
- mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \
- count1 \
-- once1 once2 once3 once4 self2 \
-+ once1 self2 \
- cancel1 cancel2 \
- semaphore4 semaphore4t semaphore5 \
- barrier1 barrier2 barrier3 barrier4 barrier5 \
-@@ -274,9 +274,9 @@
- mutex8e.pass: mutex7e.pass
- mutex8r.pass: mutex7r.pass
- once1.pass: create1.pass
--once2.pass: once1.pass
--once3.pass: once2.pass
--once4.pass: once3.pass
-+#once2.pass: once1.pass
-+#once3.pass: once2.pass
-+#once4.pass: once3.pass
- priority1.pass: join1.pass
- priority2.pass: priority1.pass barrier3.pass
- reuse1.pass: create2.pass
+++ /dev/null
---- pthreads-w32-2-8-0-release/tests/GNUmakefile.orig 2008-10-10 14:16:03.000000000 +0100
-+++ pthreads-w32-2-8-0-release/tests/GNUmakefile 2008-10-10 14:19:06.000000000 +0100
-@@ -316,20 +316,20 @@
-
- sizes.pass: sizes.exe
- @ $(ECHO) Running $*
-- $< > SIZES.$(TEST)
-+ wine $< > SIZES.$(TEST)
- @ $(CAT) SIZES.$(TEST)
- @ $(ECHO) Passed
- @ $(TOUCH) $@
-
- %.pass: %.exe
- @ $(ECHO) Running $*
-- $*
-+ wine $*
- @ $(ECHO) Passed
- @ $(TOUCH) $@
-
- %.bench: $(LIB) $(DLL) $(HDR) $(QAPC) $(XXLIBS) %.exe
- @ $(ECHO) Running $*
-- $*
-+ wine $*
- @ $(ECHO) Done
- @ $(TOUCH) $@
-
+++ /dev/null
---- ./GNUmakefile.lfarkas 2008-12-29 16:23:03.000000000 +0100
-+++ ./GNUmakefile 2008-12-29 16:23:45.000000000 +0100
-@@ -58,8 +58,8 @@
- RANLIB = $(CROSS)ranlib
- RC = $(CROSS)windres
-
--OPT = $(CLEANUP) -O3 -finline-functions
--DOPT = $(CLEANUP) -g -O0
-+OPT = $(CLEANUP) -O3 -finline-functions -mms-bitfields
-+DOPT = $(CLEANUP) -g -O0 -mms-bitfields
- XOPT =
-
- RCFLAGS = --include-dir=.
+++ /dev/null
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
-%define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw32_findrequires}
-%define __find_provides %{_mingw32_findprovides}
-
-# The tests take ages to run and require Wine.
-%define run_tests 0
-
-Name: mingw32-pthreads
-Version: 2.8.0
-Release: 4%{?dist}
-Summary: MinGW pthread library
-
-%define crazy_version %(echo %{version}|tr . -)
-
-License: LGPLv2+
-Group: Development/Libraries
-URL: http://sourceware.org/pthreads-win32/
-Source0: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-%{crazy_version}-release.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildArch: noarch
-
-Patch0: mingw32-pthreads-2.8.0-use-wine-for-tests.patch
-Patch1: mingw32-pthreads-2.8.0-no-failing-tests.patch
-Patch2: mingw32-pthreads-flags.patch
-
-BuildRequires: mingw32-filesystem >= 40
-BuildRequires: mingw32-gcc
-BuildRequires: mingw32-gcc-c++
-BuildRequires: mingw32-binutils
-
-%if %{run_tests}
-BuildRequires: wine
-%endif
-
-
-%description
-The POSIX 1003.1-2001 standard defines an application programming
-interface (API) for writing multithreaded applications. This interface
-is known more commonly as pthreads. A good number of modern operating
-systems include a threading library of some kind: Solaris (UI)
-threads, Win32 threads, DCE threads, DECthreads, or any of the draft
-revisions of the pthreads standard. The trend is that most of these
-systems are slowly adopting the pthreads standard API, with
-application developers following suit to reduce porting woes.
-
-Win32 does not, and is unlikely to ever, support pthreads
-natively. This project seeks to provide a freely available and
-high-quality solution to this problem.
-
-
-%prep
-%setup -q -n pthreads-w32-%{crazy_version}-release
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-
-%build
-%{_mingw32_make} clean
-%{_mingw32_make} CROSS=%{_mingw32_host}- GC-inlined
-%{_mingw32_make} clean
-%{_mingw32_make} CROSS=%{_mingw32_host}- GCE-inlined
-
-
-%check
-%if %{run_tests}
-pushd tests
-%{_mingw32_make} clean
-%{_mingw32_make} QAPC= \
- CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GC all-pass
-%{_mingw32_make} clean
-%{_mingw32_make} QAPC= \
- CC=%{_mingw32_cc} XXCFLAGS="-D__CLEANUP_C" TEST=GCE all-pass
-popd
-%endif
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_libdir}
-mkdir -p $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread
-
-install -m 0755 *.dll $RPM_BUILD_ROOT%{_mingw32_bindir}
-install -m 0644 *.def $RPM_BUILD_ROOT%{_mingw32_bindir}
-install -m 0644 *.a $RPM_BUILD_ROOT%{_mingw32_libdir}
-install -m 0644 *.h $RPM_BUILD_ROOT%{_mingw32_includedir}/pthread
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root)
-%doc ANNOUNCE BUGS ChangeLog CONTRIBUTORS COPYING COPYING.LIB
-%doc FAQ MAINTAINERS NEWS PROGRESS README README.NONPORTABLE TODO
-%{_mingw32_bindir}/pthreadGC2.dll
-%{_mingw32_bindir}/pthreadGCE2.dll
-%{_mingw32_bindir}/pthread.def
-%{_mingw32_libdir}/libpthreadGC2.a
-%{_mingw32_libdir}/libpthreadGCE2.a
-%{_mingw32_includedir}/pthread
-
-
-%changelog
-* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-4
-- Cleanup to the spec file, no functional changes.
-
-* Mon Dec 29 2008 Levente Farkas <lfarkas@lfarkas.org> - 2.8.0-3
-- minor cleanup
-
-* Fri Oct 10 2008 Richard W.M. Jones <rjones@redhat.com> - 2.8.0-2
-- Initial RPM release.
git.annexia.org / fedora-mingw.git / commitdiff