[arch-commits] Commit in vlc/repos (3 files)
Giovanni Scafora
giovanni at archlinux.org
Fri Dec 11 15:00:08 UTC 2009
Date: Friday, December 11, 2009 @ 10:00:08
Author: giovanni
Revision: 61092
Merged revisions 61090 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vlc/trunk
........
r61090 | giovanni | 2009-12-11 06:56:31 -0800 (ven, 11 dic 2009) | 2 lines
upgpkg: vlc 1.0.4-1
upstream release
........
Modified:
vlc/repos/extra-x86_64/ (properties)
vlc/repos/extra-x86_64/PKGBUILD
Deleted:
vlc/repos/extra-x86_64/vlc-1.0.3_fixfullscreen.patch
-------------------------------+
PKGBUILD | 20 ++++------
vlc-1.0.3_fixfullscreen.patch | 74 ----------------------------------------
2 files changed, 9 insertions(+), 85 deletions(-)
Property changes on: vlc/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /vlc/trunk:1-60770
+ /vlc/trunk:1-61091
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-12-11 14:57:07 UTC (rev 61091)
+++ extra-x86_64/PKGBUILD 2009-12-11 15:00:08 UTC (rev 61092)
@@ -5,8 +5,8 @@
pkgbase=vlc
pkgname=('vlc'
'vlc-plugin')
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=('GPL')
@@ -17,15 +17,12 @@
'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
'avahi' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'libxpm'
'xulrunner' 'pkgconfig' 'live-media>=2009.09.28' 'libnotify')
-source=(http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2
- vlc-1.0.3_fixfullscreen.patch)
-md5sums=('d0945c2489551c102a3f0f15e4591555'
- '6ee9a787d0a56c88d6a167ebb8211e21')
+source=(http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2)
+md5sums=('3a0db00380b6d5b24dc7eb73e5d8ae51')
build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- # Fix fullscreen
- patch -Np1 -i ${srcdir}/vlc-1.0.3_fixfullscreen.patch || return 1
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
[ "${CARCH}" = "i686" ] && EXTRAFEATURES="--enable-loader --enable-live555 --with-live555-tree=/usr/lib/live-media"
[ "${CARCH}" = "x86_64" ] && EXTRAFEATURES="--enable-fast-install --enable-live555 --with-live555-tree=/usr/lib/live-media"
@@ -75,7 +72,8 @@
'ncurses: for ncurses interface support')
options=('!libtool')
install=vlc.install
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
make DESTDIR=${pkgdir}/ install || return 1
for res in 16 32 48 128; do
@@ -89,6 +87,6 @@
package_vlc-plugin() {
pkgdesc="VLC mozilla browser plugin"
depends=("${pkgbase}=${pkgver}" 'nspr')
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd "${srcdir}/${pkgbase}-${pkgver}"
install -Dm755 projects/mozilla/.libs/libvlcplugin.so ${pkgdir}/usr/lib/mozilla/plugins/libvlcplugin.so || return 1
}
Deleted: extra-x86_64/vlc-1.0.3_fixfullscreen.patch
===================================================================
--- extra-x86_64/vlc-1.0.3_fixfullscreen.patch 2009-12-11 14:57:07 UTC (rev 61091)
+++ extra-x86_64/vlc-1.0.3_fixfullscreen.patch 2009-12-11 15:00:08 UTC (rev 61092)
@@ -1,74 +0,0 @@
---- a/modules/video_output/x11/xcommon.c
-+++ b/modules/video_output/x11/xcommon.c
-@@ -2179,21 +2179,24 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
-
- if( p_vout->p_sys->b_net_wm_state_fullscreen )
- {
-- XClientMessageEvent event;
--
-- memset( &event, 0, sizeof( XClientMessageEvent ) );
--
-- event.type = ClientMessage;
-- event.message_type = p_vout->p_sys->net_wm_state;
-- event.display = p_vout->p_sys->p_display;
-- event.window = p_vout->p_sys->p_win->base_window;
-- event.format = 32;
-- event.data.l[ 0 ] = 1; /* set property */
-- event.data.l[ 1 ] = p_vout->p_sys->net_wm_state_fullscreen;
-+ XClientMessageEvent event = {
-+ .type = ClientMessage,
-+ .window = p_vout->p_sys->p_win->base_window,
-+ .message_type = p_vout->p_sys->net_wm_state,
-+ .format = 32,
-+ .data = {
-+ .l = {
-+ 1, /* set property */
-+ p_vout->p_sys->net_wm_state_fullscreen,
-+ 0,
-+ 1,
-+ },
-+ },
-+ };
-
- XSendEvent( p_vout->p_sys->p_display,
- DefaultRootWindow( p_vout->p_sys->p_display ),
-- False, SubstructureRedirectMask,
-+ False, SubstructureNotifyMask|SubstructureRedirectMask,
- (XEvent*)&event );
- }
-
---- a/modules/video_output/x11/xcommon.c
-+++ b/modules/video_output/x11/xcommon.c
-@@ -2169,14 +2169,13 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
- p_vout->p_sys->p_win->base_window,
- CWOverrideRedirect,
- &attributes);
--
-- /* Make sure the change is effective */
-- XReparentWindow( p_vout->p_sys->p_display,
-- p_vout->p_sys->p_win->base_window,
-- DefaultRootWindow( p_vout->p_sys->p_display ),
-- 0, 0 );
- }
-
-+ /* Make sure the change is effective */
-+ XReparentWindow( p_vout->p_sys->p_display,
-+ p_vout->p_sys->p_win->base_window,
-+ DefaultRootWindow( p_vout->p_sys->p_display ), 0, 0 );
-+
- if( p_vout->p_sys->b_net_wm_state_fullscreen )
- {
- XClientMessageEvent event = {
-@@ -2215,11 +2214,6 @@ static void ToggleFullScreen ( vout_thread_t *p_vout )
- * as really the wm should be deciding if, on fullscreening of a window
- * the focus should go there or not, so let the wm decided */
- #define APPFOCUS 0
-- /* Make sure the change is effective */
-- XReparentWindow( p_vout->p_sys->p_display,
-- p_vout->p_sys->p_win->base_window,
-- DefaultRootWindow( p_vout->p_sys->p_display ),
-- 0, 0 );
-
- #ifdef HAVE_XINERAMA
- if( XineramaQueryExtension( p_vout->p_sys->p_display, &i_d1, &i_d2 ) &&
-
More information about the arch-commits
mailing list