rpms/xorg-x11-drv-nvidia/F-11 .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 xorg-x11-drv-nvidia.spec, 1.23, 1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17450
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 29
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 22 Apr 2009 07:52:59 -0000 1.13
+++ .cvsignore 30 Jul 2009 09:04:02 -0000 1.14
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-180.51-pkg0.run
-NVIDIA-Linux-x86_64-180.51-pkg0.run
+NVIDIA-Linux-x86_64-185.18.29-pkg0.run
+NVIDIA-Linux-x86-185.18.29-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 1 Jul 2009 17:41:30 -0000 1.14
+++ sources 30 Jul 2009 09:04:02 -0000 1.15
@@ -1,2 +1,2 @@
-534a36a15caef39118e698a871047f1a NVIDIA-Linux-x86_64-185.18.14-pkg0.run
-a91d31a9dec5deb2f9e4ca9a09e0019f NVIDIA-Linux-x86-185.18.14-pkg0.run
+c2d59f86a64c607a493bac58772c8365 NVIDIA-Linux-x86_64-185.18.29-pkg0.run
+e771348fc18b1d049a3af2a94feeab25 NVIDIA-Linux-x86-185.18.29-pkg0.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-nvidia.spec 1 Jul 2009 16:59:27 -0000 1.23
+++ xorg-x11-drv-nvidia.spec 30 Jul 2009 09:04:02 -0000 1.24
@@ -7,8 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 185.18.14
-Release: 3%{?dist}
+Version: 185.18.29
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -311,6 +311,9 @@
%changelog
+* Thu Jul 30 2009 kwizart < kwizart at gmail.com > - 185.18.29-1
+- Update to 185.18.29 (final)
+
* Wed Jul 1 2009 kwizart < kwizart at gmail.com > - 185.18.14-3
- Fix libcuda.so runtime usage - BZ 670#c4
Workaround for cudart.so wrong behaviour
14 years, 8 months
rpms/iscsitarget-kmod/devel iscsitarget-0.4.17-2.6.31.patch, NONE, 1.1 iscsitarget-kmod.spec, 1.32, 1.33
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/iscsitarget-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16814
Modified Files:
iscsitarget-kmod.spec
Added Files:
iscsitarget-0.4.17-2.6.31.patch
Log Message:
* Thu Jul 30 2009 Hans de Goede <hdegoede(a)redhat.com> - 1:0.4.17-3
- Fix compilation with 2.6.31 kernel
iscsitarget-0.4.17-2.6.31.patch:
--- NEW FILE iscsitarget-0.4.17-2.6.31.patch ---
--- iscsitarget-0.4.15/kernel/config.c~ 2008-12-27 22:14:44.000000000 +0100
+++ iscsitarget-0.4.15/kernel/config.c 2009-07-30 10:40:07.000000000 +0200
@@ -5,6 +5,7 @@
*/
#include <linux/proc_fs.h>
+#include <linux/version.h>
#include "iscsi.h"
#include "iscsi_dbg.h"
@@ -43,7 +44,9 @@ int iet_procfs_init(void)
if (!(proc_iet_dir = proc_mkdir("iet", init_net.proc_net)))
goto err;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
proc_iet_dir->owner = THIS_MODULE;
+#endif
for (i = 0; i < ARRAY_SIZE(iet_proc_entries); i++) {
ent = create_proc_entry(iet_proc_entries[i].name, 0, proc_iet_dir);
Index: iscsitarget-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget-kmod/devel/iscsitarget-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- iscsitarget-kmod.spec 5 Jun 2009 13:22:09 -0000 1.32
+++ iscsitarget-kmod.spec 30 Jul 2009 08:58:25 -0000 1.33
@@ -7,7 +7,7 @@
Name: iscsitarget-kmod
Version: 0.4.17
-Release: 2%{?dist}.14
+Release: 3%{?dist}
Epoch: 1
Summary: iscsitarget kernel modules
@@ -16,6 +16,7 @@
URL: http://sourceforge.net/projects/iscsitarget/
Source0: http://dl.sf.net/iscsitarget/iscsitarget-%{version}.tar.gz
Patch0: iscsitarget-0.4.17-2.6.29.patch
+Patch1: iscsitarget-0.4.17-2.6.31.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -41,6 +42,7 @@
%setup -q -c -T -a 0
pushd iscsitarget-%{version}
%patch0 -p0 -b .2.6.29
+%patch1 -p1 -b .2.6.31
popd
for kernel_version in %{?kernel_versions}; do
@@ -71,6 +73,9 @@
%changelog
+* Thu Jul 30 2009 Hans de Goede <hdegoede(a)redhat.com> - 1:0.4.17-3
+- Fix compilation with 2.6.31 kernel
+
* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.17-2.14
- rebuild for final F11 kernel
14 years, 8 months
rpms/vlc/F-11 vlc-1.0-bugfix-bp_zip_qt4.patch,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9956
Modified Files:
vlc-1.0-bugfix-bp_zip_qt4.patch
Log Message:
Update patch
vlc-1.0-bugfix-bp_zip_qt4.patch:
Index: vlc-1.0-bugfix-bp_zip_qt4.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/vlc-1.0-bugfix-bp_zip_qt4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.0-bugfix-bp_zip_qt4.patch 28 Jul 2009 15:44:40 -0000 1.1
+++ vlc-1.0-bugfix-bp_zip_qt4.patch 28 Jul 2009 15:58:28 -0000 1.2
@@ -22,6 +22,16 @@
return VLC_ENOMEM;
}
p_sys->psz_path = s->psz_path;
+@@ -310,7 +310,7 @@ static int Control( stream_t *s, int i_query, va_list args )
+ return VLC_EGENERIC;
+ else
+ {
+- p_sys->i_len = (size_t) i_position;
++ p_sys->i_pos = (size_t) i_position;
+ return VLC_SUCCESS;
+ }
+ }
+
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 97aca1a..31b990a 100644
--- a/modules/gui/qt4/main_interface.cpp
14 years, 8 months
rpms/vlc/devel vlc-1.0-bugfix-bp_zip_qt4.patch,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9920
Modified Files:
vlc-1.0-bugfix-bp_zip_qt4.patch
Log Message:
Update patch
vlc-1.0-bugfix-bp_zip_qt4.patch:
Index: vlc-1.0-bugfix-bp_zip_qt4.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc-1.0-bugfix-bp_zip_qt4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.0-bugfix-bp_zip_qt4.patch 28 Jul 2009 12:16:57 -0000 1.1
+++ vlc-1.0-bugfix-bp_zip_qt4.patch 28 Jul 2009 15:58:11 -0000 1.2
@@ -22,6 +22,16 @@
return VLC_ENOMEM;
}
p_sys->psz_path = s->psz_path;
+@@ -310,7 +310,7 @@ static int Control( stream_t *s, int i_query, va_list args )
+ return VLC_EGENERIC;
+ else
+ {
+- p_sys->i_len = (size_t) i_position;
++ p_sys->i_pos = (size_t) i_position;
+ return VLC_SUCCESS;
+ }
+ }
+
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 97aca1a..31b990a 100644
--- a/modules/gui/qt4/main_interface.cpp
14 years, 8 months
rpms/vlc/F-11 vlc-1.0-bugfix-bp_zip_qt4.patch, NONE, 1.1 vlc.spec, 1.42, 1.43 sources, 1.17, 1.18
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9210
Modified Files:
vlc.spec sources
Added Files:
vlc-1.0-bugfix-bp_zip_qt4.patch
Log Message:
Update to 1.0.1
vlc-1.0-bugfix-bp_zip_qt4.patch:
--- NEW FILE vlc-1.0-bugfix-bp_zip_qt4.patch ---
diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c
index 0250312..59b3f74 100644
--- a/modules/access/zip/zipstream.c
+++ b/modules/access/zip/zipstream.c
@@ -205,8 +205,8 @@ int StreamOpen( vlc_object_t *p_this )
if( !p_sys->zipFile )
{
msg_Warn( s, "unable to open file" );
- free( p_sys );
free( p_sys->fileFunctions );
+ free( p_sys );
return VLC_EGENERIC;
}
@@ -214,8 +214,8 @@ int StreamOpen( vlc_object_t *p_this )
char *psz_tmp;
if( asprintf( &psz_tmp, "%s.xspf", s->psz_path ) == -1 )
{
- free( p_sys );
free( p_sys->fileFunctions );
+ free( p_sys );
return VLC_ENOMEM;
}
p_sys->psz_path = s->psz_path;
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 97aca1a..31b990a 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1134,8 +1134,8 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
if( s.length() > 0 ) {
playlist_Add( THEPL, qtu(s), NULL,
- PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0),
- PLAYLIST_END, true, false );
+ PLAYLIST_APPEND | (first ? PLAYLIST_GO: PLAYLIST_PREPARSE),
+ PLAYLIST_END, true, pl_Unlocked );
first = false;
RecentsMRL::getInstance( p_intf )->addRecent( s );
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/vlc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vlc.spec 7 Jul 2009 11:22:40 -0000 1.42
+++ vlc.spec 28 Jul 2009 15:44:40 -0000 1.43
@@ -1,38 +1,35 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-%define with_internal_live555 0
-%define live555_date 2008.07.25
-#define vlc_rc -rc4
-%define with_mozilla 1
-%define with_dc1394 0
-%define with_directfb 1
+#global live555_date 2009.07.28
+#global vlc_rc -rc4
+%global vlc_bootstrap 1
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
-Version: 1.0.0
+Version: 1.0.1
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-%if %with_internal_live555
+%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
Source10: vlc-handlers.schemas
-Source11: shine.c
-Source12: enc_base.h
Patch0: vlc-trunk-default_font.patch
Patch1: 0001-Default-libv4l2-to-true.patch
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
+Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
+BuildRequires: desktop-file-utils
BuildRequires: gettext
+BuildRequires: prelink
-%if 1
+%if 0%{?vlc_bootstrap:1}
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -44,9 +41,7 @@
BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel
BuildRequires: dirac-devel >= 1.0.0
-%if %with_directfb
-BuildRequires: directfb-devel
-%endif
+%{!?_without_directfb:BuildRequires: directfb-devel}
BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel >= 0.4.9-0
@@ -68,7 +63,6 @@
BuildRequires: libdvbpsi-devel
BuildRequires: libdvdnav-devel
BuildRequires: libebml-devel
-BuildRequires: libhildon-devel
BuildRequires: libid3tag-devel
BuildRequires: libkate-devel
BuildRequires: libmad-devel
@@ -93,12 +87,12 @@
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%if %with_internal_live555
+%if 0%{?live555_date:1}
BuildConflicts: live555-devel
%else
BuildRequires: live555-devel >= 0-0.19.2008.04.03
%endif
-BuildRequires: kernel-headers >= 2.6.20
+BuildRequires: kernel-headers
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libmusicbrainz-devel
@@ -109,7 +103,6 @@
BuildRequires: opencv-devel
BuildRequires: openslp-devel
BuildRequires: pcre-devel
-BuildRequires: prelink
BuildRequires: pulseaudio-libs-devel >= 0.9.8
BuildRequires: portaudio-devel
BuildRequires: qt4-devel >= 4.5.2
@@ -142,21 +135,13 @@
BuildRequires: xorg-x11-proto-devel
-%if %with_mozilla
-BuildRequires: gecko-devel
-BuildRequires: nspr-devel
-%else
-Obsoletes: mozilla-vlc < %{version}-%{release}
-%endif
+%{!?_without_mozilla:BuildRequires: gecko-devel nspr-devel}
+%{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
+%{?_with_dc1394: BuildRequires: compat-libdc1394-devel compat-libraw1394-devel}
+Provides: %{name}-xorg%{_isa} = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
-%if %with_dc1394
-BuildRequires: compat-libdc1394-devel
-BuildRequires: compat-libraw1394-devel
-%endif
-
-
-Requires: vlc-core = %{version}-%{release}
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
%else
@@ -164,10 +149,11 @@
%endif
Requires: qt-x11%{_isa} >= 1:4.5.2
+
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core%{_isa} = %{version}-%{release}
%description
@@ -188,11 +174,11 @@
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
-%if %with_mozilla
+%{!?_without_mozilla:
%package -n mozilla-vlc
Summary: VLC Media Player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: %{_libdir}/mozilla/plugins
%description -n mozilla-vlc
@@ -204,7 +190,7 @@
mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
-%endif
+}
%package core
Summary: VLC Media Player core
@@ -216,7 +202,7 @@
%package nox
Summary: VLC Media Player without Xorg
Group: Applications/Multimedia
-Requires: vlc-core = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description nox
VLC Media Player with framebuffer support for X-less server.
@@ -224,26 +210,25 @@
%package plugin-jack
Summary: JACK audio plugin for VLC
Group: Applications/Multimedia
-Requires: vlc-core = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description plugin-jack
JACK audio plugin for the VLC media player.
-%if %with_dc1394
+%{?_with_dc1394:
%package plugin-dc1394
Summary: VLC Media Player Plugins for dc1394
Group: Applications/Multimedia
-Requires: %{name}-core = %{version}
-Requires: compat-libdc1394-tools
+Requires: %{name}-core%{_isa} = %{version}
%description plugin-dc1394
VLC plugin for libdc1394
-%endif
+}
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-%if %with_internal_live555
+%if 0%{?live555_date:1}
%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .default_font
@@ -253,23 +238,20 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
+%patch5 -p1 -b .bp5
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
-%if 1
-rm aclocal.m4 m4/lib*.m4
+%if 0%{?vlc_bootstrap:1}
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
./bootstrap
%endif
-#missing sources
-install -pm 0644 %{SOURCE11} modules/codec/shine
-install -pm 0644 %{SOURCE12} modules/codec/shine
-
%build
-%if %with_internal_live555
+%if 0%{?live555_date:1}
# Then bundled live555 - not needed
pushd live
# Force the use of our CFLAGS
@@ -289,12 +271,10 @@
--enable-switcher \
--enable-lua \
--enable-live555 \
-%if %with_internal_live555
+%if 0%{?live555_date:1}
--with-live555-tree=live \
%endif
-%if %with_dc1394
- --enable-dc1394 \
-%endif
+%{?_with_dc1394:--enable-dc1394} \
--enable-dv \
--enable-opencv \
--enable-pvr \
@@ -313,7 +293,6 @@
--enable-theora \
--enable-dirac \
--enable-libass \
- --enable-asademux \
--enable-xcb \
--enable-svg \
--enable-snapshot \
@@ -321,9 +300,7 @@
--enable-svgalib \
--enable-xvmc \
%endif
-%if %with_directfb
- --enable-directfb \
-%endif
+%{!?_without_directfb:--enable-directfb} \
--enable-aa \
--enable-caca \
--enable-jack \
@@ -341,9 +318,8 @@
%else
--without-contrib \
%endif
-%if %with_mozilla
- --enable-mozilla \
-%endif
+%{!?_without_mozilla:--enable-mozilla} \
+
# remove rpath from libtool
@@ -516,9 +492,9 @@
%exclude %{_libdir}/vlc/video_output/libxvmc_plugin.so
%exclude %{_libdir}/vlc/video_output/libsvgalib_plugin.so
%endif
-%if %with_directfb
+%{!?_without_directfb:
%exclude %{_libdir}/vlc/video_output/libdirectfb_plugin.so
-%endif
+}
%exclude %{_libdir}/vlc/gui/libskins2_plugin.so
%exclude %{_libdir}/vlc/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so
@@ -526,9 +502,9 @@
%exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
-%if %with_dc1394
+%{?_with_dc1394:
%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
-%endif
+}
%{_libdir}/vlc/
%{_mandir}/man1/vlc*.1*
@@ -541,16 +517,18 @@
%files nox
%defattr(-,root,root,-)
+%{!?_without_directfb:
%{_libdir}/vlc/video_output/libdirectfb_plugin.so
+}
%ifarch %{ix86} x86_64
%{_libdir}/vlc/video_output/libsvgalib_plugin.so
%endif
-%if %with_dc1394
-%files plugins-dc1394
+%{?_with_dc1394:
+%files plugin-dc1394
%defattr(-,root,root,-)
%{_libdir}/vlc/access/libdc1394_plugin.so
-%endif
+}
%files devel
%defattr(-,root,root,-)
@@ -562,15 +540,21 @@
%{_libdir}/pkgconfig/vlc-plugin.pc
%{_libdir}/pkgconfig/libvlc.pc
-%if %with_mozilla
+%{!?_without_mozilla:
%files -n mozilla-vlc
%defattr(-,root,root,-)
%{_libdir}/mozilla/plugins/libvlcplugin.so
-%endif
+}
%changelog
+* Tue Jul 28 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
+- Update to 1.0.1 (Final)
+- Improve conditionals
+- Backport zip qt4 from 1.0-bugfix
+- More %%_isa requirement
+
* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 (Final)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-11/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 7 Jul 2009 11:08:50 -0000 1.17
+++ sources 28 Jul 2009 15:44:40 -0000 1.18
@@ -1,3 +1 @@
-fc78904ab5fa73f518d8fe4e852e7f67 vlc-1.0.0.tar.bz2
-a897e4f24fb3fb993db7daf5a5f4d551 enc_base.h
-c64e9e104b1eeba838a6c87435c6533c shine.c
+6e299d373e7751bb36de001cdc6a2989 vlc-1.0.1.tar.bz2
14 years, 8 months
rpms/vlc/devel vlc.spec,1.55,1.56
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8758
Modified Files:
vlc.spec
Log Message:
Remove which is on TOKILL list
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- vlc.spec 28 Jul 2009 15:34:43 -0000 1.55
+++ vlc.spec 28 Jul 2009 15:41:21 -0000 1.56
@@ -293,7 +293,6 @@
--enable-theora \
--enable-dirac \
--enable-libass \
- --enable-asademux \
--enable-xcb \
--enable-svg \
--enable-snapshot \
14 years, 8 months
rpms/vlc/devel vlc.spec,1.54,1.55
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8472
Modified Files:
vlc.spec
Log Message:
ff still in progress
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- vlc.spec 28 Jul 2009 14:04:07 -0000 1.54
+++ vlc.spec 28 Jul 2009 15:34:43 -0000 1.55
@@ -23,7 +23,6 @@
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
Patch5: vlc-1.0-bugfix-bp_zip_qt4.patch
-Patch6: vlc-1.0-bugfix-bp-font_family.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -240,7 +239,6 @@
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
%patch5 -p1 -b .bp5
-%patch6 -p1 -b .bp_ff
rm modules/access/videodev2.h
@@ -556,7 +554,6 @@
- Update to 1.0.1 (Final)
- Improve conditionals
- Backport zip qt4 from 1.0-bugfix
-- Backport font_family from master
- More %%_isa requirement
* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
14 years, 8 months
rpms/vlc/devel vlc-1.0-bugfix-bp-font_family.patch,1.1,1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4114
Modified Files:
vlc-1.0-bugfix-bp-font_family.patch
Log Message:
Update font_family
vlc-1.0-bugfix-bp-font_family.patch:
Index: vlc-1.0-bugfix-bp-font_family.patch
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc-1.0-bugfix-bp-font_family.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vlc-1.0-bugfix-bp-font_family.patch 28 Jul 2009 13:46:03 -0000 1.1
+++ vlc-1.0-bugfix-bp-font_family.patch 28 Jul 2009 14:10:45 -0000 1.2
@@ -1,5 +1,5 @@
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
-index 7e45866..0dc3143 100644
+index 7e45866..a0c3a93 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -70,6 +70,8 @@
@@ -45,7 +45,7 @@
/* Allocate structure */
p_filter->p_sys = p_sys = malloc( sizeof( filter_sys_t ) );
-@@ -297,52 +311,77 @@ static int Create( vlc_object_t *p_this )
+@@ -297,52 +311,88 @@ static int Create( vlc_object_t *p_this )
p_sys->i_font_size = 0;
p_sys->i_display_height = 0;
@@ -71,6 +71,16 @@
- var_Get( p_filter, "freetype-font", &val );
- psz_fontfile = val.psz_string;
- if( !psz_fontfile || !*psz_fontfile )
+- {
+- free( psz_fontfile );
+- psz_fontfile = (char *)malloc( PATH_MAX + 1 );
+- if( !psz_fontfile )
+- goto error;
+-#ifdef WIN32
+- GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
+- strcat( psz_fontfile, "\\fonts\\arial.ttf" );
+-#elif defined(__APPLE__)
+- strcpy( psz_fontfile, DEFAULT_FONT );
+
+ psz_fontfamily = var_CreateGetString( p_filter, "freetype-font" );
+ p_sys->i_default_font_size = var_CreateGetInteger( p_filter, "freetype-fontsize" );
@@ -82,16 +92,7 @@
+
+ fontindex=0;
+ if( !psz_fontfamily || !*psz_fontfamily )
- {
-- free( psz_fontfile );
-- psz_fontfile = (char *)malloc( PATH_MAX + 1 );
-- if( !psz_fontfile )
-- goto error;
--#ifdef WIN32
-- GetWindowsDirectory( psz_fontfile, PATH_MAX + 1 );
-- strcat( psz_fontfile, "\\fonts\\arial.ttf" );
--#elif defined(__APPLE__)
-- strcpy( psz_fontfile, DEFAULT_FONT );
++ {
+#ifdef HAVE_FONTCONFIG
+ free( psz_fontfamily);
+ psz_fontfamily=strdup( DEFAULT_FONT );
@@ -130,13 +131,24 @@
+ FcDefaultSubstitute( fontpattern );
+
+ fontmatch = FcFontMatch( NULL, fontpattern, &fontresult );
++ if( fontresult == FcResultNoMatch )
++ {
++ free( psz_fontsize );
++ FcPatternDestroy( fontpattern );
++ FcPatternDestroy( fontmatch );
++ goto error;
++ }
+
+ FcPatternGetString( fontmatch, FC_FILE, 0, (FcChar8 **)&psz_fontfile);
+ FcPatternGetInteger( fontmatch, FC_INDEX, 0, &fontindex );
++ free( psz_fontsize );
+ if( !psz_fontfile )
++ {
++ FcPatternDestroy( fontpattern );
++ FcPatternDestroy( fontmatch );
+ goto error;
++ }
+ msg_Dbg( p_filter, "Using %s as font from file %s", psz_fontfamily, psz_fontfile);
-+ free( psz_fontsize );
+#else
+ psz_fontfile = psz_fontfamily;
+#endif
@@ -155,7 +167,7 @@
if( i_error == FT_Err_Unknown_File_Format )
{
msg_Err( p_filter, "file %s have unknown format", psz_fontfile );
-@@ -369,11 +408,8 @@ static int Create( vlc_object_t *p_this )
+@@ -369,11 +419,8 @@ static int Create( vlc_object_t *p_this )
p_sys->i_use_kerning = FT_HAS_KERNING( p_sys->p_face );
@@ -167,7 +179,7 @@
p_sys->pp_font_attachments = NULL;
p_sys->i_font_attachments = 0;
-@@ -381,10 +417,13 @@ static int Create( vlc_object_t *p_this )
+@@ -381,10 +428,13 @@ static int Create( vlc_object_t *p_this )
p_filter->pf_render_text = RenderText;
#ifdef HAVE_FONTCONFIG
p_filter->pf_render_html = RenderHtml;
14 years, 8 months
rpms/vlc/devel vlc.spec,1.53,1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3546
Modified Files:
vlc.spec
Log Message:
Today's date
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- vlc.spec 28 Jul 2009 14:03:42 -0000 1.53
+++ vlc.spec 28 Jul 2009 14:04:07 -0000 1.54
@@ -552,7 +552,7 @@
%changelog
-* Mon Jul 27 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
+* Tue Jul 28 2009 kwizart < kwizart at gmail.com > - 1.0.1-1
- Update to 1.0.1 (Final)
- Improve conditionals
- Backport zip qt4 from 1.0-bugfix
14 years, 8 months
rpms/vlc/devel vlc.spec,1.52,1.53
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3513
Modified Files:
vlc.spec
Log Message:
- More %%_isa requirement
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vlc.spec 28 Jul 2009 13:46:03 -0000 1.52
+++ vlc.spec 28 Jul 2009 14:03:42 -0000 1.53
@@ -140,8 +140,9 @@
%{?_without_mozilla:Obsoletes: mozilla-vlc < %{version}-%{release}}
%{?_with_dc1394: BuildRequires: compat-libdc1394-devel compat-libraw1394-devel}
+Provides: %{name}-xorg%{_isa} = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
-Requires: vlc-core = %{version}-%{release}
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
%else
@@ -153,7 +154,7 @@
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-core%{_isa} = %{version}-%{release}
%description
@@ -178,7 +179,7 @@
%package -n mozilla-vlc
Summary: VLC Media Player plugin for Mozilla compatible web browsers
Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-xorg%{_isa} = %{version}-%{release}
Requires: %{_libdir}/mozilla/plugins
%description -n mozilla-vlc
@@ -202,7 +203,7 @@
%package nox
Summary: VLC Media Player without Xorg
Group: Applications/Multimedia
-Requires: vlc-core = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description nox
VLC Media Player with framebuffer support for X-less server.
@@ -210,7 +211,7 @@
%package plugin-jack
Summary: JACK audio plugin for VLC
Group: Applications/Multimedia
-Requires: vlc-core = %{version}-%{release}
+Requires: vlc-core%{_isa} = %{version}-%{release}
%description plugin-jack
JACK audio plugin for the VLC media player.
@@ -220,7 +221,7 @@
%package plugin-dc1394
Summary: VLC Media Player Plugins for dc1394
Group: Applications/Multimedia
-Requires: %{name}-core = %{version}
+Requires: %{name}-core%{_isa} = %{version}
%description plugin-dc1394
VLC plugin for libdc1394
@@ -556,6 +557,7 @@
- Improve conditionals
- Backport zip qt4 from 1.0-bugfix
- Backport font_family from master
+- More %%_isa requirement
* Mon Jul 6 2009 kwizart < kwizart at gmail.com > - 1.0.0-1
- Update to 1.0.0 (Final)
14 years, 8 months