Skip to content

V
vlc-2-2
Commit de10515e authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* remove no longer used caca.patch 

* Fix 2 gcc4 / SDK issues in glib
* fixes for libogg, libvorbis and libtheora to make sure LDFLAGS isn't (doubled up) by it's LDFLAGS_save. Issue reported and fixed upstream as well.

Note the patches are not all enabled yet, since my contrib Makefile is quite "edited" atm due to SDK work
parent 0ce12ee8
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 12 deletions
extras/contrib/src/Patches/caca.patch deleted 100644 → 0
View file @ 0ce12ee8
diff -ru libcaca/examples/cacaview.c libcaca-original/examples/cacaview.c
--- libcaca/examples/cacaview.c Mon Jan 5 17:14:27 2004
+++ libcaca-original/examples/cacaview.c Mon Jan 5 17:17:07 2004
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <unistd.h>
#if defined(HAVE_IMLIB2_H)
extras/contrib/src/Patches/glib.patch 0 → 100644
View file @ de10515e
diff -urN glib1.2-1.2.10 glib
--- glib1.2-1.2.10 glib.h 2005-04-18 23:58:21.000000000 -0400
+++ glib/glib.h 2005-04-18 23:58:48.000000000 -0400
@@ -272,7 +272,7 @@
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ < 4)
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */
--- glib1.2-1.2.10/gmain.c Mon Feb 26 22:00:21 2001
+++ glib/gmain.c Sun Aug 24 13:46:51 2003
@@ -187,6 +187,8 @@
/* SunOS has poll, but doesn't provide a prototype. */
# if defined (sun) && !defined (__SVR4)
extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
+#else
+#include <poll.h> /* The opengroup defines the poll.h header as standard */
# endif /* !sun */
static GPollFunc poll_func = (GPollFunc) poll;
#else /* !HAVE_POLL */
extras/contrib/src/Patches/libogg-1.1.patch 0 → 100644
View file @ de10515e
diff -ruN libogg-1.1.2/configure.in libogg/configure.in
--- libogg-1.1.2/configure.in 2004-09-23 15:30:58.000000000 +0200
+++ libogg/configure.in 2005-11-14 22:16:04.000000000 +0100
@@ -28,17 +28,17 @@
case $host in
*-*-irix*)
DEBUG="-g -signed"
- CFLAGS="-O2 -w -signed"
+ EXTRA_CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed"
;;
sparc-sun-solaris*)
DEBUG="-v -g"
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p"
;;
esac
@@ -46,30 +46,30 @@
case $host in
*-*-linux*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;;
sparc-sun-*)
DEBUG="-g -Wall -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char -mv8"
PROFILE="-pg -g -O20 -fsigned-char -mv8"
;;
*-*-darwin*)
DEBUG="-fno-common -g -Wall -fsigned-char"
- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
+ EXTRA_CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
;;
*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
+ EXTRA_CFLAGS="-O20 -fsigned-char"
PROFILE="-O20 -g -pg -fsigned-char"
;;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
DEBUG="$DEBUG $cflags_save"
PROFILE="$PROFILE $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl Checks for programs.
extras/contrib/src/Patches/libvorbis-1.1.patch 0 → 100644
View file @ de10515e
diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
--- libvorbis-1.1.1/configure.in 2005-06-21 15:47:45.000000000 +0200
+++ libvorbis/configure.in 2005-11-14 22:40:18.000000000 +0100
@@ -86,15 +86,15 @@
CC=cc
fi
DEBUG="-g -signed"
- CFLAGS="-O2 -w -signed"
+ EXTRA_CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed" ;;
sparc-sun-solaris*)
DEBUG="-v -g"
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc" ;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p" ;;
esac
else
@@ -102,7 +102,7 @@
case $host in
*86-*-linux*)
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
# PROFILE="-Wall -W -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
PROFILE="-Wall -W -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
@@ -142,33 +142,33 @@
AC_MSG_WARN([********************************************************])
AC_MSG_WARN([ ])
- CFLAGS=${OPT}" -D__NO_MATH_INLINES"
+ EXTRA_CFLAGS=${OPT}" -D__NO_MATH_INLINES"
PROFILE=${PROFILE}" -D__NO_MATH_INLINES"
fi;;
powerpc-*-linux*)
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES"
- CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
+ EXTRA_CFLAGS="-O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT"
PROFILE="-pg -g -O3 -ffast-math -mfused-madd -mcpu=750 -D_REENTRANT";;
*-*-linux*)
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
sparc-sun-*)
DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
- CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
+ EXTRA_CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
*-*-darwin*)
DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
*)
DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
+ EXTRA_CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl --------------------------------------------------
dnl Check for headers
extras/contrib/src/Patches/theora.patch
View file @ de10515e
......@@ -22,3 +22,31 @@ diff -ruN libtheora-1.0alpha5/Makefile.in libtheora/Makefile.in
EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
theora-uninstalled.pc.in
diff -ruN libtheora-1.0alpha5/configure.ac libtheora/configure.ac
--- libtheora-1.0alpha5/configure.ac 2005-08-20 20:43:13.000000000 +0200
+++ libtheora/configure.ac 2005-11-14 22:49:14.000000000 +0100
@@ -89,7 +89,7 @@
case $host in
*)
DEBUG="-g"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p" ;;
esac
else
@@ -97,12 +97,12 @@
case $host in
*)
DEBUG="-g -W -D__NO_MATH_INLINES"
- CFLAGS="-g -O2 -Wall"
+ EXTRA_CFLAGS="-g -O2 -Wall"
PROFILE="-W -pg -g -O2 -fno-inline-functions";;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl Set extra linker options
case "$target_os" in
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment