Update to 1.1.0-pre3

el8
Nicolas Chauvet 15 years ago
parent d2486ec9d6
commit 9979bf4f1c

2
.gitignore vendored

@ -1 +1 @@
vlc-1.1.0-pre1.tar.bz2 vlc-1.1.0-pre3.tar.bz2

@ -1,55 +0,0 @@
/*****************************************************************************
* position.h: Support routines for logo and marquee plugin objects
*****************************************************************************
* Copyright (C) 2010 M2X BV
*
* Authors: JP Dinger <jpd (at) videolan (dot) org>
*
* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef POSITION_H
#define POSITION_H
struct posidx_s { const char *n; size_t i; };
static const posidx_s posidx[] = {
{ "center", 0 },
{ "left", 1 },
{ "right", 2 },
{ "top", 4 },
{ "bottom", 8 },
{ "top-left", 5 },
{ "top-right", 6 },
{ "bottom-left", 9 },
{ "bottom-right", 10 },
};
enum { num_posidx = sizeof(posidx)/sizeof(*posidx) };
static inline const char *position_bynumber( size_t i )
{
for( const posidx_s *h=posidx; h<posidx+num_posidx; ++h )
if( h->i == i )
return h->n;
return "undefined";
}
static inline bool position_byname( const char *n, size_t &i )
{
for( const posidx_s *h=posidx; h<posidx+num_posidx; ++h )
if( !strcasecmp( n, h->n ) )
{ i=h->i; return true; }
return false;
}
#endif

@ -1 +1 @@
2cbda5fa9b52d10d917f23a4a00dbbf5 vlc-1.1.0-pre1.tar.bz2 b7d978b3e5285b7012d47bc0b3b74c47 vlc-1.1.0-pre3.tar.bz2

@ -1,5 +1,5 @@
#global live555_date 2009.07.28 #global live555_date 2009.07.28
%global vlc_rc -pre1 %global vlc_rc -pre3
#global vlc_bootstrap 1 #global vlc_bootstrap 1
%global _with_freeworld 1 %global _with_freeworld 1
%if 0%{?_with_freeworld:1} %if 0%{?_with_freeworld:1}
@ -19,7 +19,7 @@
Summary: The cross-platform open-source multimedia framework, player and server Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc Name: vlc
Version: 1.1.0 Version: 1.1.0
Release: 0.1.pre1%{?dist} Release: 0.5.pre3%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.videolan.org URL: http://www.videolan.org
@ -28,8 +28,6 @@ Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif %endif
Source10: vlc-handlers.schemas Source10: vlc-handlers.schemas
Source11: xcb_keysym.h
Source12: position.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -59,7 +57,7 @@ BuildRequires: gnutls-devel >= 1.0.17
BuildRequires: gsm-devel BuildRequires: gsm-devel
BuildRequires: hal-devel BuildRequires: hal-devel
BuildRequires: jack-audio-connection-kit-devel BuildRequires: jack-audio-connection-kit-devel
BuildRequires: kdelibs-devel >= 4.4.0 BuildRequires: kde-filesystem
BuildRequires: libavc1394-devel BuildRequires: libavc1394-devel
BuildRequires: libass-devel >= 0.9.7 BuildRequires: libass-devel >= 0.9.7
BuildRequires: libcaca-devel BuildRequires: libcaca-devel
@ -78,7 +76,7 @@ BuildRequires: libmatroska-devel >= 0.7.6
BuildRequires: libmodplug-devel BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel BuildRequires: libmpcdec-devel
BuildRequires: libmtp-devel BuildRequires: libmtp-devel >= 1.0.0
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libprojectM-qt-devel BuildRequires: libprojectM-qt-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
@ -146,6 +144,7 @@ BuildRequires: xorg-x11-proto-devel
Provides: %{name}-xorg%{_isa} = %{version}-%{release} Provides: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: vlc-core%{_isa} = %{version}-%{release} Requires: vlc-core%{_isa} = %{version}-%{release}
Requires: kde-filesystem
%if 0%{?fedora} > 10 %if 0%{?fedora} > 10
Requires: dejavu-sans-fonts Requires: dejavu-sans-fonts
@ -153,7 +152,7 @@ Requires: dejavu-serif-fonts
%else %else
Requires: dejavu-fonts Requires: dejavu-fonts
%endif %endif
Requires: qt-x11%{_isa} >= 1:4.5.2 Requires: qt4%{?_isa} >= %{_qt4_version}
@ -162,8 +161,8 @@ Requires: qt-x11%{_isa} >= 1:4.5.2
VLC media player is a highly portable multimedia player and multimedia framework VLC media player is a highly portable multimedia player and multimedia framework
capable of reading most audio and video formats as well as DVDs, Audio CDs VCDs, capable of reading most audio and video formats as well as DVDs, Audio CDs VCDs,
and various streaming protocols. and various streaming protocols.
It can also be used as a media converter or a server to stream in unicast or It can also be used as a media converter or a server to stream in uni-cast or
multicast in IPv4 or IPv6 on networks. multi-cast in IPv4 or IPv6 on networks.
%package devel %package devel
@ -184,7 +183,7 @@ Requires: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: %{_libdir}/mozilla/plugins Requires: %{_libdir}/mozilla/plugins
%description -n mozilla-vlc %description -n mozilla-vlc
This package contains a VLC media player plugin for Mozilla compatible This package contains a VLC media player plugging for Mozilla compatible
web browsers. web browsers.
} }
@ -202,7 +201,7 @@ Group: Applications/Multimedia
Requires: vlc-core%{_isa} = %{version}-%{release} Requires: vlc-core%{_isa} = %{version}-%{release}
%description nox %description nox
VLC media player with framebuffer support for X-less server. VLC media player with frame-buffer support for X-less server.
%package plugin-jack %package plugin-jack
Summary: JACK audio plugin for VLC Summary: JACK audio plugin for VLC
@ -224,8 +223,6 @@ JACK audio plugin for the VLC media player.
#sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.{in,am} #sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.{in,am}
#patch4 -p1 -b .mmx_pic #patch4 -p1 -b .mmx_pic
install -pm 0644 %{SOURCE11} modules/video_output/xcb/xcb_keysym.h
install -pm 0644 %{SOURCE12} projects/mozilla/control/position.h
rm modules/access/videodev2.h rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
%if 0%{?vlc_bootstrap:1} %if 0%{?vlc_bootstrap:1}
@ -252,6 +249,7 @@ popd
--disable-rpath \ --disable-rpath \
--with-binary-version=%{version} \ --with-binary-version=%{version} \
--with-tuning=no \ --with-tuning=no \
--with-kde-solid=%{_kde4_appsdir}/solid/actions \
%{?_with_ffmpeg:--enable-switcher} \ %{?_with_ffmpeg:--enable-switcher} \
--enable-lua \ --enable-lua \
--enable-live555 \ --enable-live555 \
@ -304,7 +302,7 @@ popd
%{!?_without_mozilla:--enable-mozilla} \ %{!?_without_mozilla:--enable-mozilla} \
%if 0 %if 1
# remove rpath from libtool # remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@ -327,17 +325,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man1
install -pm 644 doc/vlc*.1 $RPM_BUILD_ROOT%{_mandir}/man1
%if 0
for i in 16x16 32x32 48x48 128x128 ; do
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps
install -pm 0644 share/vlc${i}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${i}/apps/vlc.png
done
%endif
desktop-file-install --vendor "" \ desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
--delete-original \ --delete-original \
@ -361,7 +348,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/ install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
rm -rf $RPM_BUILD_ROOT%{_datadir}/kde4
%find_lang %{name} %find_lang %{name}
@ -417,7 +403,7 @@ fi || :
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop
#exclude #{_datadir}/kde4/apps/solid/actions/vlc-*.desktop %{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png %{_datadir}/icons/hicolor/*/apps/vlc*.png
%{_datadir}/icons/hicolor/*/apps/vlc*.xpm %{_datadir}/icons/hicolor/*/apps/vlc*.xpm
%{_datadir}/vlc/skins2/ %{_datadir}/vlc/skins2/
@ -519,8 +505,12 @@ fi || :
%changelog %changelog
* Sat May 1 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1.1.0-0.5.pre3
- Update to 1.1.0-pre3
* Fri Apr 16 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1.1.0-0.3.pre1 * Fri Apr 16 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1.1.0-0.3.pre1
- Update to 1.1.0-pre1 - Update to 1.1.0-pre1
- Built for Fedora
- Changed summary and descriptions - Changed summary and descriptions
* Sat Feb 27 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1.0.5-2 * Sat Feb 27 2010 Nicolas Chauvet <kwizart@fedoraproject.org> - 1.0.5-2

@ -1,90 +0,0 @@
/* This list MUST be in XK_* incremental order (see keysymdef.h),
* so that binary search works.
* Multiple X keys can match the same VLC key.
* X key symbols must be in the first column of the struct. */
{ XK_BackSpace, KEY_BACKSPACE, },
{ XK_Tab, KEY_TAB, },
{ XK_Return, KEY_ENTER, },
{ XK_Escape, KEY_ESC, },
{ XK_Home, KEY_HOME, },
{ XK_Left, KEY_LEFT, },
{ XK_Up, KEY_UP, },
{ XK_Right, KEY_RIGHT, },
{ XK_Down, KEY_DOWN, },
{ XK_Page_Up, KEY_PAGEUP, },
{ XK_Page_Down, KEY_PAGEDOWN, },
{ XK_End, KEY_END, },
{ XK_Begin, KEY_HOME, },
{ XK_Insert, KEY_INSERT, },
{ XK_Menu, KEY_MENU },
/* Numeric pad keys */
{ XK_KP_Space, ' ', },
{ XK_KP_Tab, KEY_TAB, },
{ XK_KP_Enter, KEY_ENTER, },
{ XK_KP_F1, KEY_F1, },
{ XK_KP_F2, KEY_F2, },
{ XK_KP_F3, KEY_F3, },
{ XK_KP_F4, KEY_F4, },
{ XK_KP_Home, KEY_HOME, },
{ XK_KP_Left, KEY_LEFT, },
{ XK_KP_Up, KEY_UP, },
{ XK_KP_Right, KEY_RIGHT, },
{ XK_KP_Down, KEY_DOWN, },
{ XK_KP_Page_Up, KEY_PAGEUP, },
{ XK_KP_Page_Down, KEY_PAGEDOWN, },
{ XK_KP_End, KEY_END, },
{ XK_KP_Begin, KEY_HOME, }, /* KP middle (5 without numlock) */
{ XK_KP_Insert, KEY_INSERT, },
{ XK_KP_Delete, KEY_DELETE, },
{ XK_KP_Equal, '=', },
{ XK_KP_Multiply, '*', },
{ XK_KP_Add, '+', },
{ XK_KP_Separator, ',', },
{ XK_KP_Subtract, '-', },
{ XK_KP_Decimal, ',', }, /* FIXME: I don't know that key */
{ XK_KP_Divide, '/', },
{ XK_KP_0, '0', },
{ XK_KP_1, '1', },
{ XK_KP_2, '2', },
{ XK_KP_3, '3', },
{ XK_KP_4, '4', },
{ XK_KP_5, '5', },
{ XK_KP_6, '6', },
{ XK_KP_7, '7', },
{ XK_KP_8, '8', },
{ XK_KP_9, '9', },
{ XK_F1, KEY_F1, },
{ XK_F2, KEY_F2, },
{ XK_F3, KEY_F3, },
{ XK_F4, KEY_F4, },
{ XK_F5, KEY_F5, },
{ XK_F6, KEY_F6, },
{ XK_F7, KEY_F7, },
{ XK_F8, KEY_F8, },
{ XK_F9, KEY_F9, },
{ XK_F10, KEY_F10, },
{ XK_F11, KEY_F11, },
{ XK_F12, KEY_F12, },
{ XK_Delete, KEY_DELETE, },
/* XFree86 extensions */
{ XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN, },
{ XF86XK_AudioMute, KEY_VOLUME_MUTE, },
{ XF86XK_AudioRaiseVolume, KEY_VOLUME_UP, },
{ XF86XK_AudioPlay, KEY_MEDIA_PLAY_PAUSE, },
{ XF86XK_AudioStop, KEY_MEDIA_STOP, },
{ XF86XK_AudioPrev, KEY_MEDIA_PREV_TRACK, },
{ XF86XK_AudioNext, KEY_MEDIA_NEXT_TRACK, },
{ XF86XK_HomePage, KEY_BROWSER_HOME, },
{ XF86XK_Search, KEY_BROWSER_SEARCH, },
{ XF86XK_Back, KEY_BROWSER_BACK, },
{ XF86XK_Forward, KEY_BROWSER_FORWARD, },
{ XF86XK_Stop, KEY_BROWSER_STOP, },
{ XF86XK_Refresh, KEY_BROWSER_REFRESH, },
{ XF86XK_Favorites, KEY_BROWSER_FAVORITES, },
{ XF86XK_AudioPause, KEY_MEDIA_PLAY_PAUSE, },
{ XF86XK_Reload, KEY_BROWSER_REFRESH, },
Loading…
Cancel
Save