[Pkg-kde-commits] rev 1876 - in
branches/kde-3.4.0/packages/kdemultimedia/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Tue Sep 27 01:50:36 UTC 2005
Author: chrsmrtn
Date: 2005-09-27 01:50:34 +0000 (Tue, 27 Sep 2005)
New Revision: 1876
Added:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
mpeglib noopt fix.
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-09-26 22:00:57 UTC (rev 1875)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-09-27 01:50:34 UTC (rev 1876)
@@ -1,3 +1,13 @@
+kdemultimedia (4:3.4.2-3) UNRELEASED; urgency=low
+
+ +++ Changes by Christopher Martin:
+
+ * Add a patch which disables MMX optimizations in the mpeglib package for
+ the i386 architecture. These were causing the library to contain non-PIC
+ code, a violation of the release policy.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdemultimedia (4:3.4.2-2) unstable; urgency=low
+++ Changes by Adeodato Simó:
Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff 2005-09-26 22:00:57 UTC (rev 1875)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/13_mpeglib_PIC.diff 2005-09-27 01:50:34 UTC (rev 1876)
@@ -0,0 +1,15 @@
+--- kde.orig/mpeglib/configure.in.in
++++ kde.patched/mpeglib/configure.in.in
+@@ -197,12 +197,6 @@
+ AC_MSG_RESULT($OS_TYPE)
+
+ INTELCPPFLAG=
+-dnl MMX_SUPPORT is set as variable in main configure.in.in
+-dnl now make it a config.h entry
+-if test x$MMX_SUPPORT = xyes; then
+- AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
+- INTELCPPFLAG="-DINTEL"
+-fi
+ AC_SUBST(INTELCPPFLAG)
+
+ AC_DEFUN([KDE_MPEGLIB_COMPILES],
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-09-26 22:00:57 UTC (rev 1875)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-09-27 01:50:34 UTC (rev 1876)
@@ -1517,6 +1517,59 @@
AC_MSG_RESULT([$SED])
])
+--- aclocal.m4
++++ aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # Figure out how to run the assembler. -*- Autoconf -*-
+
+@@ -522,6 +522,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- akode/arts_plugin/Makefile.in
+++ akode/arts_plugin/Makefile.in
@@ -1,4 +1,4 @@
@@ -3497,6 +3550,18 @@
#>+ 3
clean-closures:
+--- config.h.in
++++ config.h.in
+@@ -315,9 +315,6 @@
+ header file. */
+ #undef HAVE__USR_SRC_SYS_I386_ISA_SOUND_AWE_VOICE_H
+
+-/* Define if you have MMX support on x86 with gcc */
+-#undef INTEL
+-
+ /* Suffix for lib directories */
+ #undef KDELIBSUFF
+
--- configure
+++ configure
@@ -464,7 +464,7 @@
@@ -9470,7 +9535,22 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42712,8 +42536,7 @@
+@@ -42614,14 +42438,6 @@
+ echo "${ECHO_T}$OS_TYPE" >&6
+
+ INTELCPPFLAG=
+-if test x$MMX_SUPPORT = xyes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define INTEL 1
+-_ACEOF
+-
+- INTELCPPFLAG="-DINTEL"
+-fi
+
+
+
+@@ -42712,8 +42528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9480,7 +9560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42788,8 +42611,7 @@
+@@ -42788,8 +42603,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9490,7 +9570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42849,8 +42671,7 @@
+@@ -42849,8 +42663,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9500,7 +9580,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43144,8 +42965,7 @@
+@@ -43144,8 +42957,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9510,7 +9590,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43217,8 +43037,7 @@
+@@ -43217,8 +43029,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9520,7 +9600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43272,8 +43091,7 @@
+@@ -43272,8 +43083,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9530,7 +9610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43344,8 +43162,7 @@
+@@ -43344,8 +43154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9540,7 +9620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43399,8 +43216,7 @@
+@@ -43399,8 +43208,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9550,7 +9630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43467,8 +43283,7 @@
+@@ -43467,8 +43275,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9560,7 +9640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43633,8 +43448,7 @@
+@@ -43633,8 +43440,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9570,7 +9650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43703,8 +43517,7 @@
+@@ -43703,8 +43509,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9580,7 +9660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43888,8 +43701,7 @@
+@@ -43888,8 +43693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9590,7 +9670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43983,8 +43795,7 @@
+@@ -43983,8 +43787,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9600,7 +9680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44070,8 +43881,7 @@
+@@ -44070,8 +43873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9610,7 +9690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44175,8 +43985,7 @@
+@@ -44175,8 +43977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9620,7 +9700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44462,8 +44271,7 @@
+@@ -44462,8 +44263,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9630,7 +9710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44587,8 +44395,7 @@
+@@ -44587,8 +44387,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9640,7 +9720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45320,6 +45127,13 @@
+@@ -45320,6 +45119,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9654,7 +9734,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -46399,6 +46213,9 @@
+@@ -46399,6 +46205,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -9664,7 +9744,7 @@
s, at KDECONFIG@,$KDECONFIG,;t t
s, at kde_libs_prefix@,$kde_libs_prefix,;t t
s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46894,11 +46711,6 @@
+@@ -46894,11 +46703,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9676,7 +9756,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -46937,6 +46749,12 @@
+@@ -46937,6 +46741,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9700,6 +9780,19 @@
KDE_SET_PREFIX
dnl generate the config header
+@@ -1909,12 +1911,6 @@
+ AC_MSG_RESULT($OS_TYPE)
+
+ INTELCPPFLAG=
+-dnl MMX_SUPPORT is set as variable in main configure.in.in
+-dnl now make it a config.h entry
+-if test x$MMX_SUPPORT = xyes; then
+- AC_DEFINE(INTEL,1,[Define if you have MMX support on x86 with gcc])
+- INTELCPPFLAG="-DINTEL"
+-fi
+ AC_SUBST(INTELCPPFLAG)
+
+ AC_DEFUN([KDE_MPEGLIB_COMPILES],
--- doc/artsbuilder/images/Makefile.in
+++ doc/artsbuilder/images/Makefile.in
@@ -1,4 +1,4 @@
More information about the pkg-kde-commits
mailing list