summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorjoerg <joerg>2013-10-25 21:48:16 +0000
committerjoerg <joerg>2013-10-25 21:48:16 +0000
commit62345e5b6a606d4baac20595e48c65bbfc2a1b37 (patch)
treeb44f15ace601e76d1efc5ad2a5d3beff4f35453e /multimedia
parent1a28a15ac96d500a2ec4afa55cede92dc5b611d3 (diff)
downloadpkgsrc-62345e5b6a606d4baac20595e48c65bbfc2a1b37.tar.gz
Don't use -fforce-addr.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libtheora/Makefile.common3
-rw-r--r--multimedia/libtheora/distinfo5
-rw-r--r--multimedia/libtheora/patches/patch-aa13
-rw-r--r--multimedia/libtheora/patches/patch-configure.ac13
4 files changed, 29 insertions, 5 deletions
diff --git a/multimedia/libtheora/Makefile.common b/multimedia/libtheora/Makefile.common
index e98b8c64df9..7bc34a30066 100644
--- a/multimedia/libtheora/Makefile.common
+++ b/multimedia/libtheora/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2012/10/08 09:21:07 asau Exp $
+# $NetBSD: Makefile.common,v 1.6 2013/10/25 21:48:16 joerg Exp $
#
# used by multimedia/libtheora-docs/Makefile
@@ -21,3 +21,4 @@ CONFIGURE_ENV+= ac_cv_path_SDL_CONFIG=no
PLIST_SUBST+= SUBDIR=${DISTNAME}
DISTINFO_FILE= ${.CURDIR}/../../multimedia/libtheora/distinfo
+PATCHDIR= ${.CURDIR}/../../multimedia/libtheora/patches
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index 37f96578413..7028e7675a8 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/01/17 19:44:58 drochner Exp $
+$NetBSD: distinfo,v 1.17 2013/10/25 21:48:16 joerg Exp $
SHA1 (libtheora-1.1.1.tar.bz2) = 8dcaa8e61cd86eb1244467c0b64b9ddac04ae262
RMD160 (libtheora-1.1.1.tar.bz2) = 1d07234bd7e2296c61d6e30fe9816415aa7fd8e5
Size (libtheora-1.1.1.tar.bz2) = 1903175 bytes
-SHA1 (patch-aa) = 3e23582e299e476636a54aa19fb390d6e1052a99
+SHA1 (patch-aa) = ae5fe2d8798fa8db59b023ad8c67d4d83763a56f
SHA1 (patch-ab) = 07e93bf47039ec589ce3fbdb26d5d8dbcc0c4f65
+SHA1 (patch-configure.ac) = 62c74c43f4958f23bbca809e9de5abd8e36921d6
diff --git a/multimedia/libtheora/patches/patch-aa b/multimedia/libtheora/patches/patch-aa
index aff9dc40952..ea945612513 100644
--- a/multimedia/libtheora/patches/patch-aa
+++ b/multimedia/libtheora/patches/patch-aa
@@ -1,10 +1,19 @@
-$NetBSD: patch-aa,v 1.6 2009/11/09 12:56:00 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2013/10/25 21:48:16 joerg Exp $
Never add -lcompat for ftime. If someone cares about the example,
it should use gettimeofday.
---- configure.orig 2009-11-09 13:52:17.000000000 +0100
+--- configure.orig 2009-10-01 18:04:08.000000000 +0000
+++ configure
+@@ -11863,7 +11863,7 @@ else
+ case $host in
+ *)
+ DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ esac
+ fi
@@ -13734,99 +13734,6 @@ else
fi
diff --git a/multimedia/libtheora/patches/patch-configure.ac b/multimedia/libtheora/patches/patch-configure.ac
new file mode 100644
index 00000000000..d444f199ebc
--- /dev/null
+++ b/multimedia/libtheora/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/10/25 21:48:16 joerg Exp $
+
+--- configure.ac.orig 2013-10-15 22:47:41.000000000 +0000
++++ configure.ac
+@@ -168,7 +168,7 @@ else
+ case $host in
+ *)
+ DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ esac
+ fi