diff options
-rw-r--r-- | vlc/build/libcdio-0.80_Makefile.patch | 12 | ||||
-rw-r--r-- | vlc/build/libdvdread-20041028_static_dvdcss.patch | 173 | ||||
-rw-r--r-- | vlc/build/libdvdread_autogen.patch | 13 | ||||
-rw-r--r-- | vlc/build/vlc-0.9.0_deffont.patch | 14 | ||||
-rw-r--r-- | vlc/build/vlc-0.9.0_libdvdread_configure.patch | 24 | ||||
-rw-r--r-- | vlc/build/vlc-0.9.0_upnp.patch | 18 |
6 files changed, 254 insertions, 0 deletions
diff --git a/vlc/build/libcdio-0.80_Makefile.patch b/vlc/build/libcdio-0.80_Makefile.patch new file mode 100644 index 00000000..00b5fac9 --- /dev/null +++ b/vlc/build/libcdio-0.80_Makefile.patch @@ -0,0 +1,12 @@ +--- Makefile.am.old 2008-03-15 17:21:28.000000000 +0100 ++++ Makefile.am 2008-06-18 23:55:57.000000000 +0200 +@@ -48,7 +48,7 @@ + libcdio++.pc \ + libiso9660.pc \ + libiso9660++.pc \ +- libudf.pc ++ libudf.pc \ + $(paranoiapcs) + + + diff --git a/vlc/build/libdvdread-20041028_static_dvdcss.patch b/vlc/build/libdvdread-20041028_static_dvdcss.patch new file mode 100644 index 00000000..a3dbcdf9 --- /dev/null +++ b/vlc/build/libdvdread-20041028_static_dvdcss.patch @@ -0,0 +1,173 @@ +diff -urN libdvdread-20041028/dvdread/bswap.h libdvdread-20060107/dvdread/bswap.h +--- libdvdread-20041028/dvdread/bswap.h Wed Jun 18 13:35:04 2003 ++++ libdvdread-20060107/dvdread/bswap.h Sat Jan 7 20:53:26 2006 +@@ -84,6 +84,18 @@ + (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | \ + (((x) & 0x000000ff) << 24)) ++ ++#ifdef __GNUC__ ++#define B2N_64(x) \ ++ x = ((((x) & 0xff00000000000000LL) >> 56) | \ ++ (((x) & 0x00ff000000000000LL) >> 40) | \ ++ (((x) & 0x0000ff0000000000LL) >> 24) | \ ++ (((x) & 0x000000ff00000000LL) >> 8) | \ ++ (((x) & 0x00000000ff000000LL) << 8) | \ ++ (((x) & 0x0000000000ff0000LL) << 24) | \ ++ (((x) & 0x000000000000ff00LL) << 40) | \ ++ (((x) & 0x00000000000000ffLL) << 56)) ++#else + #define B2N_64(x) \ + x = ((((x) & 0xff00000000000000) >> 56) | \ + (((x) & 0x00ff000000000000) >> 40) | \ +@@ -93,6 +105,7 @@ + (((x) & 0x0000000000ff0000) << 24) | \ + (((x) & 0x000000000000ff00) << 40) | \ + (((x) & 0x00000000000000ff) << 56)) ++#endif + + #else + +diff -urN libdvdread-20041028/dvdread/cmd_print.c libdvdread-20060107/dvdread/cmd_print.c +--- libdvdread-20041028/dvdread/cmd_print.c Wed Jun 18 13:00:44 2003 ++++ libdvdread-20060107/dvdread/cmd_print.c Sat Jan 7 20:38:08 2006 +@@ -19,6 +19,7 @@ + #include "config.h" + + #include <stdio.h> ++#include <ctype.h> + + #if defined(HAVE_INTTYPES_H) + #include <inttypes.h> +diff -urN libdvdread-20041028/dvdread/dvd_input.c libdvdread-20060107/dvdread/dvd_input.c +--- libdvdread-20041028/dvdread/dvd_input.c Thu Oct 28 14:09:02 2004 ++++ libdvdread-20060107/dvdread/dvd_input.c Sat Jan 7 20:41:16 2006 +@@ -27,6 +27,11 @@ + #include "dvd_reader.h" + #include "dvd_input.h" + ++#ifndef HAVE_DVDCSS_DVDCSS_H ++ ++/* dlopening libdvdcss */ ++#include <dlfcn.h> ++ + /* The function pointers that is the exported interface of this file. */ + dvd_input_t (*dvdinput_open) (const char *); + int (*dvdinput_close) (dvd_input_t); +@@ -35,18 +40,6 @@ + int (*dvdinput_read) (dvd_input_t, void *, int, int); + char * (*dvdinput_error) (dvd_input_t); + +-#ifdef HAVE_DVDCSS_DVDCSS_H +-/* linking to libdvdcss */ +-#include <dvdcss/dvdcss.h> +-#define DVDcss_open(a) dvdcss_open((char*)(a)) +-#define DVDcss_close dvdcss_close +-#define DVDcss_seek dvdcss_seek +-#define DVDcss_title dvdcss_title +-#define DVDcss_read dvdcss_read +-#define DVDcss_error dvdcss_error +-#else +-/* dlopening libdvdcss */ +-#include <dlfcn.h> + typedef struct dvdcss_s *dvdcss_handle; + static dvdcss_handle (*DVDcss_open) (const char *); + static int (*DVDcss_close) (dvdcss_handle); +@@ -54,7 +47,6 @@ + static int (*DVDcss_title) (dvdcss_handle, int); + static int (*DVDcss_read) (dvdcss_handle, void *, int, int); + static char * (*DVDcss_error) (dvdcss_handle); +-#endif + + /* The DVDinput handle, add stuff here for new input methods. */ + struct dvd_input_s { +@@ -260,23 +252,22 @@ + + return 0; + } +- ++#endif + + /** + * Setup read functions with either libdvdcss or minimal DVD access. + */ + int dvdinput_setup(void) + { +- void *dvdcss_library = NULL; +- char **dvdcss_version = NULL; +- + #ifdef HAVE_DVDCSS_DVDCSS_H + /* linking to libdvdcss */ +- dvdcss_library = &dvdcss_library; /* Give it some value != NULL */ +- /* the DVDcss_* functions have been #defined at the top */ +- dvdcss_version = &dvdcss_interface_2; +- ++ fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", ++ dvdcss_interface_2); ++ return 1; + #else ++ void *dvdcss_library = NULL; ++ char **dvdcss_version = NULL; ++ + /* dlopening libdvdcss */ + dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); + +@@ -315,7 +306,6 @@ + dlclose(dvdcss_library); + } + } +-#endif /* HAVE_DVDCSS_DVDCSS_H */ + + if(dvdcss_library != NULL) { + /* +@@ -348,4 +338,5 @@ + dvdinput_error = file_error; + return 0; + } ++#endif /* HAVE_DVDCSS_DVDCSS_H */ + } +diff -urN libdvdread-20041028/dvdread/dvd_input.h libdvdread-20060107/dvdread/dvd_input.h +--- libdvdread-20041028/dvdread/dvd_input.h Thu Feb 13 22:06:56 2003 ++++ libdvdread-20060107/dvdread/dvd_input.h Sat Jan 7 20:27:42 2006 +@@ -27,6 +27,21 @@ + + #define DVDINPUT_READ_DECRYPT (1 << 0) + ++#ifdef HAVE_DVDCSS_DVDCSS_H ++ ++/* linking to libdvdcss */ ++#include <dvdcss/dvdcss.h> ++ ++#define dvd_input_t dvdcss_t ++ ++#define dvdinput_open(_a) dvdcss_open(_a) ++#define dvdinput_close(_a) dvdcss_close(_a) ++#define dvdinput_seek(_a, _b) dvdcss_seek(_a,_b,DVDINPUT_NOFLAGS) ++#define dvdinput_title(_a, _b) dvdcss_title(_a,_b) ++#define dvdinput_read(_a,_b,_c,_d) dvdcss_read(_a,_b,_c,_d) ++#define dvdinput_error(_a) dvdcss_error(_a) ++ ++#else + typedef struct dvd_input_s *dvd_input_t; + + /** +@@ -38,6 +53,7 @@ + extern int (*dvdinput_title) (dvd_input_t, int); + extern int (*dvdinput_read) (dvd_input_t, void *, int, int); + extern char * (*dvdinput_error) (dvd_input_t); ++#endif + + /** + * Setup function accessed by dvd_reader.c. Returns 1 if there is CSS support. +diff -urN libdvdread-20041028/dvdread/dvd_reader.c libdvdread-20060107/dvdread/dvd_reader.c +--- libdvdread-20041028/dvdread/dvd_reader.c Tue Aug 5 12:44:12 2003 ++++ libdvdread-20060107/dvdread/dvd_reader.c Sat Jan 7 20:45:36 2006 +@@ -1031,7 +1031,7 @@ + bytes_read = DVDReadBytes( dvd_file, buffer, file_size ); + if( bytes_read != file_size ) { + fprintf( stderr, "libdvdread: DVDDiscId read returned %d bytes" +- ", wanted %d\n", bytes_read, file_size ); ++ ", wanted %d\n", (int)bytes_read, file_size ); + DVDCloseFile( dvd_file ); + return -1; + } diff --git a/vlc/build/libdvdread_autogen.patch b/vlc/build/libdvdread_autogen.patch new file mode 100644 index 00000000..9846922b --- /dev/null +++ b/vlc/build/libdvdread_autogen.patch @@ -0,0 +1,13 @@ +--- autogen.sh.orig 2008-07-30 15:30:09.000000000 +0200 ++++ autogen.sh 2008-07-30 17:18:07.000000000 +0200 +@@ -85,8 +85,8 @@ + #------------------- + try_libtool_executable() { + libtool=$1 +- LT="`$libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-\;]//g'`" +- if test "$LT" -ne "" ; then ++ LT="`$libtool --version | awk '{ print $4 }' | sed -e 's/[a-zA-Z\ \.\(\)\-\;]//g' | sed -e '/^$/d'`" ++ if test "$LT" != "" ; then + LIBTOOL_MIN="`echo $LIBTOOL_MIN | sed -e 's/[a-zA-Z\ \.\(\)\-]//g'`" + if test $LT -lt 100 ; then + LT=`expr $LT \* 10` diff --git a/vlc/build/vlc-0.9.0_deffont.patch b/vlc/build/vlc-0.9.0_deffont.patch new file mode 100644 index 00000000..b958bacf --- /dev/null +++ b/vlc/build/vlc-0.9.0_deffont.patch @@ -0,0 +1,14 @@ +diff -uarN vlc-0.9.0-test2.orig/modules/misc/freetype.c vlc-0.9.0-test2/modules/misc/freetype.c +--- vlc-0.9.0-test2.orig/modules/misc/freetype.c 2008-07-05 00:03:21.000000000 +0200 ++++ vlc-0.9.0-test2/modules/misc/freetype.c 2008-07-05 14:48:28.000000000 +0200 +@@ -61,8 +61,8 @@ + #define DEFAULT_FONT "" /* Default font found at run-time */ + #define FC_DEFAULT_FONT "Arial" + #else +-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf" +-#define FC_DEFAULT_FONT "Serif Bold" ++#define DEFAULT_FONT "@@XPREFIX@@/lib/X11/fonts/TTF/DejaVuSans.ttf" ++#define FC_DEFAULT_FONT "Sans Bold" + #endif + + #if defined(HAVE_FRIBIDI) diff --git a/vlc/build/vlc-0.9.0_libdvdread_configure.patch b/vlc/build/vlc-0.9.0_libdvdread_configure.patch new file mode 100644 index 00000000..6ee04601 --- /dev/null +++ b/vlc/build/vlc-0.9.0_libdvdread_configure.patch @@ -0,0 +1,24 @@ +--- vlc-0.9.0-test3.orig/configure.ac 2008-07-30 18:43:51.000000000 +0200 ++++ vlc-0.9.0-test3/configure.ac 2008-07-30 20:03:21.000000000 +0200 +@@ -2099,17 +2099,17 @@ + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot cd to ${with_dvdread_tree}]) + fi +- if test -f "${real_dvdread_tree}/dvdread/.libs/libdvdread.a" ++ if test -f "${real_dvdread_tree}/src/.libs/libdvdread.a" + then + dnl Use a custom libdvdread +- AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) ++ AC_MSG_RESULT(${real_dvdread_tree}/src/.libs/libdvdread.a) + VLC_ADD_PLUGIN([dvdread]) +- VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}]) ++ VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/src/.libs -ldvdread ${LIBS_dvdcss}]) + VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) + else + dnl The given libdvdread wasn't built + AC_MSG_RESULT(no) +- AC_MSG_ERROR([cannot find ${real_dvdread_tree}/dvdread/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) ++ AC_MSG_ERROR([cannot find ${real_dvdread_tree}/src/.libs/libdvdread.a, make sure you compiled libdvdread in ${with_dvdread_tree}]) + fi + fi + else diff --git a/vlc/build/vlc-0.9.0_upnp.patch b/vlc/build/vlc-0.9.0_upnp.patch new file mode 100644 index 00000000..1cbffe41 --- /dev/null +++ b/vlc/build/vlc-0.9.0_upnp.patch @@ -0,0 +1,18 @@ +diff -uarN vlc-0.9.0-test2.orig/configure.ac vlc-0.9.0-test2/configure.ac +--- vlc-0.9.0-test2.orig/configure.ac 2008-07-05 00:03:20.000000000 +0200 ++++ vlc-0.9.0-test2/configure.ac 2008-07-05 21:52:01.000000000 +0200 +@@ -4767,12 +4767,12 @@ + + VLC_ADD_CXXFLAGS([upnp_intel], [ ]) + AS_IF([test "x${enable_upnp}" != "xno"], [ +- AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread]) ++ AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lthreadutil -lixml -lpthread]) + AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"], [ + AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)]) + ]) + AS_IF([test "${has_upnp}" = "yes"], [ +- VLC_ADD_LIBS([upnp_intel], [-lupnp -lixml]) ++ VLC_ADD_LIBS([upnp_intel], [-lupnp -lthreadutil -lixml]) + ]) + ], [ + has_upnp="no" |