From 885e064862e27494e03a853b248c5b87b2f2a4f5 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 5 Mar 2007 00:33:29 +0000 Subject: [PATCH] Clifford Wolf: Some hotfixes for working an complete VLC: - Updated vlc (0.8.6a) - Updated wxwidgets (2.8.0) - Hotfixed VLC for new wxwidgets version - Let VLC autodetect most stuff - Updated libdvdread (0.9.7) - Activate libdvdcss support in libdvdread [2007021803201412624] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8241 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/libdvdread/libdvdread.conf | 1 + package/public/libdvdread/libdvdread.desc | 4 +- package/public/vlc/vlc.conf | 32 +++++------- package/public/vlc/vlc.desc | 4 +- package/public/vlc/wxwidgets.patch | 11 ++++ package/tsa/wxwidgets/libs-fix.patch | 30 ----------- package/tsa/wxwidgets/wxwidgets.conf | 62 ----------------------- package/tsa/wxwidgets/wxwidgets.desc | 4 +- 8 files changed, 31 insertions(+), 117 deletions(-) create mode 100644 package/public/libdvdread/libdvdread.conf create mode 100644 package/public/vlc/wxwidgets.patch delete mode 100644 package/tsa/wxwidgets/libs-fix.patch delete mode 100644 package/tsa/wxwidgets/wxwidgets.conf diff --git a/package/public/libdvdread/libdvdread.conf b/package/public/libdvdread/libdvdread.conf new file mode 100644 index 000000000..e3dfd83e6 --- /dev/null +++ b/package/public/libdvdread/libdvdread.conf @@ -0,0 +1 @@ +var_append confopt " " "--with-libdvdcss" diff --git a/package/public/libdvdread/libdvdread.desc b/package/public/libdvdread/libdvdread.desc index 217d90096..af1d83295 100644 --- a/package/public/libdvdread/libdvdread.desc +++ b/package/public/libdvdread/libdvdread.desc @@ -38,8 +38,8 @@ [L] GPL [S] Beta -[V] 0.9.6 +[V] 0.9.7 [P] X -?---5---9 120.200 -[D] 3406694128 libdvdread-0.9.6.tar.gz http://www.dtek.chalmers.se/groups/dvd/dist/ +[D] 2315313340 libdvdread-0.9.7.tar.gz http://www.dtek.chalmers.se/groups/dvd/dist/ diff --git a/package/public/vlc/vlc.conf b/package/public/vlc/vlc.conf index e47ce6597..987037b6c 100644 --- a/package/public/vlc/vlc.conf +++ b/package/public/vlc/vlc.conf @@ -1,39 +1,33 @@ # --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# +# # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# +# # ROCK Linux: rock-src/package/public/vlc/vlc.conf # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. A copy of the GNU General Public # License can be found at Documentation/COPYING. -# +# # Many people helped and are helping developing ROCK Linux. Please # have a look at http://www.rocklinux.org/ and the Documentation/TEAM # file for details. -# +# # --- ROCK-COPYRIGHT-NOTE-END --- -pkginstalled libdvdread && var_append confopt ' ' '--enable-dvdread' -pkginstalled wxwidgets || var_append confopt ' ' '--disable-wxwidgets' +var_append confopt ' ' '--enable-release' +var_append confopt ' ' '--enable-loader' -pkginstalled faad2 && var_append confopt ' ' '--enable-faad' -pkginstalled ncurses && var_append confopt ' ' '--enable-ncurses' -pkginstalled flac && var_append confopt ' ' '--enable-flac' +var_append confopt ' ' '--enable-esd' +var_append confopt ' ' '--enable-arts' +var_append confopt ' ' '--enable-jack' -# set these so libsmbclient.h and libsmbclient.so are found -if pkginstalled samba ; then - CFLAGS="$CFLAGS -I$root/$pkg_samba_prefix/include" - CPPFLAGS="$CPPFLAGS -I$root/$pkg_samba_prefix/include" - LDFLAGS="$LDFLAGS -L/$root/$pkg_samba_prefix/lib" - export CFLAGS CPPFLAGS LDFLAGS -fi +var_append confopt ' ' '--enable-pvr' +var_append confopt ' ' '--enable-v4l' +var_append confopt ' ' '--enable-dvb' -# things you generally want on linux -var_append confopt ' ' '--enable-pvr --enable-v4l --enable-dvb' diff --git a/package/public/vlc/vlc.desc b/package/public/vlc/vlc.desc index b4b1beb0d..160c65c1e 100644 --- a/package/public/vlc/vlc.desc +++ b/package/public/vlc/vlc.desc @@ -41,7 +41,7 @@ [L] GPL [S] Alpha -[V] 0.8.5 +[V] 0.8.6a [P] X -?---5---9 206.200 -[D] 2703643018 vlc-0.8.5.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.8.5/ +[D] 2717965504 vlc-0.8.6a.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.8.6a/ diff --git a/package/public/vlc/wxwidgets.patch b/package/public/vlc/wxwidgets.patch new file mode 100644 index 000000000..9311860c5 --- /dev/null +++ b/package/public/vlc/wxwidgets.patch @@ -0,0 +1,11 @@ +--- ./modules/gui/wxwidgets/dialogs.cpp 2007-02-09 13:51:37.000000000 +0100 ++++ ./modules/gui/wxwidgets/dialogs.cpp 2007-02-09 14:06:59.000000000 +0100 +@@ -376,7 +376,7 @@ + { + p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) ); + p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) ); +- p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | ++ p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) | + (p_arg->b_multiple ? wxMULTIPLE:0) ); + } + diff --git a/package/tsa/wxwidgets/libs-fix.patch b/package/tsa/wxwidgets/libs-fix.patch deleted file mode 100644 index 170be4e53..000000000 --- a/package/tsa/wxwidgets/libs-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/wxwidgets/libs-fix.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./wx-config.in.orig 2004-11-22 02:40:51.785674568 +0100 -+++ ./wx-config.in 2004-11-22 02:41:16.329943272 +0100 -@@ -959,7 +959,7 @@ - if [ "x$this_linkage" = "x-static" ]; then - wx_libs="$wx_libs ${libdir}/libwx_@TOOLCHAIN_NAME@.a $ldlibs_core @LIBS@" - else -- wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@" -+ wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@ $ldlibs_core @LIBS@" - fi - - using_gui=yes diff --git a/package/tsa/wxwidgets/wxwidgets.conf b/package/tsa/wxwidgets/wxwidgets.conf deleted file mode 100644 index 257f1e50a..000000000 --- a/package/tsa/wxwidgets/wxwidgets.conf +++ /dev/null @@ -1,62 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/wxwidgets/wxwidgets.conf -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -# var_append extraconfopt ' ' '--enable-monolithic' -var_append extraconfopt ' ' '--enable-optimize' -var_append extraconfopt ' ' '--enable-debug_flag' -var_append extraconfopt ' ' '--enable-shared' -var_append extraconfopt ' ' '--enable-xrc' -var_append extraconfopt ' ' '--enable-largefile' -var_append extraconfopt ' ' '--enable-unicode' - -if pkginstalled gtk+ ; then - var_append extraconfopt ' ' '--with-gtk' -elif pkginstalled gtk+12 ; then - var_append extraconfopt ' ' '--with-gtk --disable-gtk2' -else - var_append extraconfopt ' ' '--disable-gui' -fi - -pkginstalled libsdl && \ - var_append extraconfopt ' ' '--with-sdl' - -# FIXME: how to do this right? -if [ -f $root/usr/lib/libGL.so ] ; then - var_append extraconfopt ' ' '--with-opengl' - hook_add inmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"' - hook_add postmake 10 'make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" install' -fi - -build_contrib() { - make -C contrib/src/gizmos - make -C contrib/src/stc - make -C contrib/src/animate -} - -install_contrib() { - make -C contrib/src/gizmos install - make -C contrib/src/stc install - make -C contrib/src/animate install -} - -hook_add inmake 9 build_contrib -hook_add postmake 9 install_contrib diff --git a/package/tsa/wxwidgets/wxwidgets.desc b/package/tsa/wxwidgets/wxwidgets.desc index 2110dfee5..363ce3ce9 100644 --- a/package/tsa/wxwidgets/wxwidgets.desc +++ b/package/tsa/wxwidgets/wxwidgets.desc @@ -40,8 +40,8 @@ [L] LGPL [S] Stable -[V] 2.6.3 +[V] 2.8.0 [P] X -?---5---9 142.800 -[D] 1747493956 wxWidgets-2.6.3.tar.gz http://dl.sourceforge.net/sourceforge/wxwindows/ +[D] 638735874 wxWidgets-2.8.0.tar.bz2 http://dl.sourceforge.net/sourceforge/wxwindows/