[libmikmod] New upstream and new upstream release 3.3.2
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Oct 14 13:21:06 UTC 2013
commit cee171b2ffdeda754fda1398183dbecf4c9475ff
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Oct 14 15:21:02 2013 +0200
New upstream and new upstream release 3.3.2
- Drop a bunch of merged patches
.gitignore | 1 +
libmikmod-64bit.patch | 10 ++--
libmikmod-CVE-2007-6720.patch | 110 ------------------------------
libmikmod-CVE-2009-0179.patch | 13 ----
libmikmod-alsadrv.patch | 148 -----------------------------------------
libmikmod-cflags.patch | 68 ++++++++++++-------
libmikmod-malloc-fail.patch | 20 ------
libmikmod-multilib.patch | 34 ++--------
libmikmod-strip-lib.patch | 11 ---
libmikmod.spec | 39 +++++------
sources | 2 +-
11 files changed, 74 insertions(+), 382 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 14ffcc2..b686f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/libmikmod-3.2.0.tar.gz
+/libmikmod-3.3.2.tar.gz
diff --git a/libmikmod-64bit.patch b/libmikmod-64bit.patch
index 0da8952..08b0f8a 100644
--- a/libmikmod-64bit.patch
+++ b/libmikmod-64bit.patch
@@ -5,12 +5,12 @@ diff -up libmikmod-3.2.0b3/include/mikmod.h.in.64bit libmikmod-3.2.0b3/include/m
@DOES_NOT_HAVE_SIGNED@
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
+-#if defined (_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
+#include <stdint.h>
+#if __WORDSIZE == 64
/* 64 bit architectures */
- typedef signed char SBYTE; /* 1 byte, signed */
+ typedef signed char SBYTE; /* 1 byte, signed */
diff -up libmikmod-3.2.0b3/include/mikmod_internals.h.64bit libmikmod-3.2.0b3/include/mikmod_internals.h
--- libmikmod-3.2.0b3/include/mikmod_internals.h.64bit 2012-03-14 18:02:59.000000000 +0100
+++ libmikmod-3.2.0b3/include/mikmod_internals.h 2012-04-10 06:10:18.667415429 +0200
@@ -18,9 +18,9 @@ diff -up libmikmod-3.2.0b3/include/mikmod_internals.h.64bit libmikmod-3.2.0b3/in
/*========== More type definitions */
/* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha) || defined (__x64_64) || defined (_LP64) || defined (__powerpc64__)
+-#if !defined(_WIN32) && (defined(_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x64_64) || defined(__powerpc64__))
+#include <stdint.h>
+#if __WORDSIZE == 64
- typedef long SLONGLONG;
+ typedef long SLONGLONG;
#define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
+ #elif defined(_WIN64) /* win64 is LLP64, not LP64 */
diff --git a/libmikmod-cflags.patch b/libmikmod-cflags.patch
index fbe6349..53d350f 100644
--- a/libmikmod-cflags.patch
+++ b/libmikmod-cflags.patch
@@ -1,40 +1,55 @@
-diff -up libmikmod-3.2.0/config.h.in~ libmikmod-3.2.0/config.h.in
-diff -up libmikmod-3.2.0/configure.in~ libmikmod-3.2.0/configure.in
---- libmikmod-3.2.0/configure.in~ 2012-06-01 15:15:29.000000000 +0200
-+++ libmikmod-3.2.0/configure.in 2013-04-06 12:43:30.200076725 +0200
-@@ -634,66 +634,6 @@ then
+diff -up libmikmod-3.3.2/configure~ libmikmod-3.3.2/configure
+--- libmikmod-3.3.2/configure~ 2013-10-05 16:00:10.000000000 +0200
++++ libmikmod-3.3.2/configure 2013-10-14 11:57:50.484129254 +0200
+@@ -14566,83 +14566,6 @@ $as_echo "#define HAVE_RTLD_GLOBAL 1" >>
fi
fi
-# If compiling with gcc, use adequate optimization flags
--if test $ac_cv_prog_gcc = yes
+-if test $ac_cv_c_compiler_gnu = yes
-then
- # On at least x86 platforms, gcc 2.7.2.1 and earlier won't work if -O3 (or
- # -finline-functions) are used. Versions 2.7.2.3, 2.8.x and egcs are ok
- # (didn't test 2.7.2.2).
- # Until there's an easy way to catch broken inlining, we choose flags known
- # to work correctly depending of the compiler version.
-- AC_CACHE_CHECK([if inlining functions is safe],
-- libmikmod_cv_gcc_inline_safe,
-- AC_TRY_RUN([
--int main()
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if inlining functions is safe" >&5
+-$as_echo_n "checking if inlining functions is safe... " >&6; }
+-if test "${libmikmod_cv_gcc_inline_safe+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
-{
--#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 7)
-- exit(0);
--#else
-- exit(1);
+-
+-#if !(defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 7))
+-#error inlining functions is not safe
-#endif
--}],
-- libmikmod_cv_gcc_inline_safe=yes,
-- libmikmod_cv_gcc_inline_safe=no,
-- libmikmod_cv_gcc_inline_safe=no))
-- if test $libmikmod_cv_gcc_inline_safe = yes
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- libmikmod_cv_gcc_inline_safe=yes
+-else
+- libmikmod_cv_gcc_inline_safe=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libmikmod_cv_gcc_inline_safe" >&5
+-$as_echo "$libmikmod_cv_gcc_inline_safe" >&6; }
+- if test $libmikmod_cv_gcc_inline_safe = no
- then
-- CFLAGS="$CFLAGS -finline-functions"
-- else
- CFLAGS="$CFLAGS -fno-strength-reduce"
- fi
-- CFLAGS="$CFLAGS -funroll-loops -ffast-math"
+- CFLAGS="$CFLAGS -ffast-math"
+- if test $libmikmod_darwin = yes; then
+- CFLAGS="$CFLAGS -fno-common"
+- fi
- if test $libmikmod_debug = yes
- then
- CFLAGS="$CFLAGS -Wall -Werror"
@@ -46,15 +61,16 @@ diff -up libmikmod-3.2.0/configure.in~ libmikmod-3.2.0/configure.in
- # gcc works fine. Issue a warning if the compiler is pgcc, until a reliable
- # way to detect flawed version (or, better, a reliable workaround) is
- # found.
--dnl do not cache this test - better rechecking every time
-- AC_MSG_CHECKING(if compiler is pgcc)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler is pgcc" >&5
+-$as_echo_n "checking if compiler is pgcc... " >&6; }
- if ($CC -v 2>&1 | grep ^pgcc > /dev/null) 2>/dev/null
- then
- libmikmod_gcc_is_pgcc=yes
- else
- libmikmod_gcc_is_pgcc=no
- fi
-- AC_MSG_RESULT($libmikmod_gcc_is_pgcc)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libmikmod_gcc_is_pgcc" >&5
+-$as_echo "$libmikmod_gcc_is_pgcc" >&6; }
- if test $libmikmod_gcc_is_pgcc = yes
- then
- echo "
@@ -68,4 +84,4 @@ diff -up libmikmod-3.2.0/configure.in~ libmikmod-3.2.0/configure.in
-
if test x$libmikmod_threads != xno
then
- AC_DEFINE(HAVE_PTHREAD)
+
diff --git a/libmikmod-multilib.patch b/libmikmod-multilib.patch
index 3c4f21b..b6d37dd 100644
--- a/libmikmod-multilib.patch
+++ b/libmikmod-multilib.patch
@@ -1,33 +1,13 @@
---- libmikmod-3.1.11/libmikmod-config.in.old 2004-01-21 18:43:52.000000000 +0100
-+++ libmikmod-3.1.11/libmikmod-config.in 2006-05-31 17:36:12.000000000 +0200
-@@ -5,7 +5,7 @@
- exec_prefix_set=no
-
- usage="\
--Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--ldadd]"
-+Usage: libmikmod-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--libs32] [--libs64] [--cflags] [--ldadd]"
-
- if test $# -eq 0 ; then
- echo "${usage}" 1>&2
-@@ -49,9 +49,21 @@
+diff -up libmikmod-3.3.2/libmikmod-config.in~ libmikmod-3.3.2/libmikmod-config.in
+--- libmikmod-3.3.2/libmikmod-config.in~ 2013-09-28 16:10:55.000000000 +0200
++++ libmikmod-3.3.2/libmikmod-config.in 2013-10-14 12:21:12.242028265 +0200
+@@ -49,8 +49,7 @@ while test $# -gt 0 ; do
echo @LIB_LDADD@
;;
--libs)
-+ if [ -d /usr/lib64 ]; then
-+ libdir=-L${exec_prefix}/lib64
-+ else
-+ libdir=-L${exec_prefix}/lib
-+ fi
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
-+ --libs32)
- libdir=-L${exec_prefix}/lib
- echo $libdir -lmikmod @LIBRARY_LIB@
+- libdir=-L"$exec_prefix/lib"
+- echo $libdir -lmikmod @LIBRARY_LIB@
++ echo -lmikmod @LIBRARY_LIB@
;;
-+ --libs64)
-+ libdir=-L${exec_prefix}/lib64
-+ echo $libdir -lmikmod @LIBRARY_LIB@
-+ ;;
*)
echo "${usage}" 1>&2
- exit 1
diff --git a/libmikmod.spec b/libmikmod.spec
index a8aa228..00fc6d9 100644
--- a/libmikmod.spec
+++ b/libmikmod.spec
@@ -1,21 +1,15 @@
Summary: A MOD music file player library
Name: libmikmod
-Version: 3.2.0
-Release: 22%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
License: GPLv2 and LGPLv2+
Group: Applications/Multimedia
-URL: http://mikmod.shlomifish.org/
-Source0: http://mikmod.shlomifish.org/files/libmikmod-%{version}.tar.gz
+URL: http://mikmod.sourceforge.net/
+Source0: http://downloads.sourceforge.net/mikmod/libmikmod-%{version}.tar.gz
Patch0: libmikmod-64bit.patch
-Patch1: libmikmod-strip-lib.patch
-Patch2: libmikmod-multilib.patch
-Patch3: libmikmod-CVE-2007-6720.patch
-Patch4: libmikmod-CVE-2009-0179.patch
-# Fix rhbz#855130
-Patch5: libmikmod-malloc-fail.patch
-Patch6: libmikmod-alsadrv.patch
-Patch7: libmikmod-cflags.patch
-BuildRequires: alsa-lib-devel libtool
+Patch1: libmikmod-multilib.patch
+Patch2: libmikmod-cflags.patch
+BuildRequires: alsa-lib-devel
%description
libmikmod is a library used by the mikmod MOD music file player for
@@ -41,16 +35,14 @@ applications for mikmod.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-autoreconf -i -f
%build
-%configure --enable-dl --disable-altivec --enable-alsa
+%ifarch x86_64
+%configure --enable-dl --enable-alsa --enable-simd
+%else
+%configure --enable-dl --enable-alsa --disable-simd
+%endif
make %{?_smp_flags}
@@ -81,6 +73,7 @@ fi
%files devel
%{_bindir}/*-config
%{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/*
%{_includedir}/*
%{_infodir}/mikmod*
@@ -88,6 +81,10 @@ fi
%changelog
+* Mon Oct 14 2013 Hans de Goede <hdegoede at redhat.com> - 3.3.2-1
+- New upstream and new upstream release 3.3.2
+- Drop a bunch of merged patches
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -196,5 +193,5 @@ fi
- don't ship static library
- update upstream patch, drop texinfo dependency (thanks to Stepan Kasal)
-* Wed Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-1
+* Thu Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 3.1.11-1
- package libmikmod
diff --git a/sources b/sources
index ca8f757..364665a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96e9820d72a41fe27ff304071739696c libmikmod-3.2.0.tar.gz
+60ac77a804d082230df3009af11ef44f libmikmod-3.3.2.tar.gz
More information about the scm-commits
mailing list