rpms/vlc/F-10 vlc.spec,1.23,1.24 vlc-1.0.2-compiler.patch,1.1,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19087
Modified Files:
vlc.spec
Removed Files:
vlc-1.0.2-compiler.patch
Log Message:
Rsync for F-10
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/vlc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- vlc.spec 23 Sep 2009 19:22:33 -0000 1.23
+++ vlc.spec 23 Sep 2009 19:28:53 -0000 1.24
@@ -22,7 +22,6 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0.2-compiler.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -238,13 +237,6 @@
%patch3 -p1 -b .dmo_pic
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
%patch4 -p1 -b .mmx_pic
-%ifarch %{ix86} x86_64
-#https://bugzilla.redhat.com/show_bug.cgi?id=524439
-%patch5 -p1 -b .compiler
-%endif
-
-#Workaround internal compiler bug in bd.c
-sed -i -e 's/screen bd zip/screen zip/' modules/access/Modules.am
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -554,8 +546,8 @@
%changelog
-* Sun Sep 20 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1
-- Workaround the compiler bug on x86 x86_64 by disabling optimization.
+* Wed Sep 23 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1
+- Rsync for F-10
* Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
- Update to 1.0.2
--- vlc-1.0.2-compiler.patch DELETED ---
14 years, 10 months
rpms/vlc/F-10 0001-Default-libv4l2-to-true.patch, NONE, 1.1 0002-Default-aout-for-pulse.patch, NONE, 1.1 vlc-1.0.2-compiler.patch, NONE, 1.1 vlc-handlers.schemas, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.10, 1.11 vlc.spec, 1.22, 1.23 vlc-0.9.2-pulse_default.patch, 1.1, NONE vlc-0.9.8a-embeddedvideo.patch, 1.1, NONE vlc-0.9.9-0.9.10git20090409.patch, 1.1, NONE vlc-0.9.9-fix_playlist.patch, 1.1, NONE vlc-embeddedvideo.patch, 1.1, NONE vlc-pulse0071.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18308/F-10
Modified Files:
.cvsignore sources vlc.spec
Added Files:
0001-Default-libv4l2-to-true.patch
0002-Default-aout-for-pulse.patch vlc-1.0.2-compiler.patch
vlc-handlers.schemas
Removed Files:
vlc-0.9.2-pulse_default.patch vlc-0.9.8a-embeddedvideo.patch
vlc-0.9.9-0.9.10git20090409.patch vlc-0.9.9-fix_playlist.patch
vlc-embeddedvideo.patch vlc-pulse0071.patch
Log Message:
Rsync vlc-1.0.2 to F-10
0001-Default-libv4l2-to-true.patch:
--- NEW FILE 0001-Default-libv4l2-to-true.patch ---
>From d3bef7cde676ad96ce036cb10aa534ca1c5d0e24 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart(a)gmail.com>
Date: Tue, 26 May 2009 18:38:07 +0200
Subject: [PATCH] Default libv4l2 to true
---
modules/access/v4l2.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 31dae66..42a8e9d 100644
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -261,7 +261,7 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
#ifdef HAVE_LIBV4L2
- add_bool( CFG_PREFIX "use-libv4l2", false, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
+ add_bool( CFG_PREFIX "use-libv4l2", true, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
#endif
set_section( N_( "Tuner" ), NULL )
--
1.6.0.6
0002-Default-aout-for-pulse.patch:
--- NEW FILE 0002-Default-aout-for-pulse.patch ---
>From bba9ed13be6a4dade99360583dcc4a9eef62d1f4 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet (kwizart) <kwizart(a)gmail.com>
Date: Tue, 26 May 2009 23:11:50 +0200
Subject: [PATCH] Default aout for pulse
---
modules/audio_output/pulse.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 86bd6dd..93b2763 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -97,7 +97,7 @@ static void uninit(aout_instance_t *p_aout);
vlc_module_begin ()
set_shortname( "Pulse Audio" )
set_description( N_("Pulseaudio audio output") )
- set_capability( "audio output", 40 )
+ set_capability( "audio output", 200 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_AOUT )
add_shortcut( "pulseaudio" )
--
1.6.0.6
vlc-1.0.2-compiler.patch:
--- NEW FILE vlc-1.0.2-compiler.patch ---
diff -up vlc-1.0.2/modules/access/bd/Modules.am.compiler vlc-1.0.2/modules/access/bd/Modules.am
--- vlc-1.0.2/modules/access/bd/Modules.am.compiler 2009-09-18 00:23:37.000000000 +0200
+++ vlc-1.0.2/modules/access/bd/Modules.am 2009-09-20 10:35:40.107945580 +0200
@@ -8,3 +8,5 @@ SOURCES_access_bd = \
libvlc_LTLIBRARIES += libaccess_bd_plugin.la
+libaccess_bd_plugin_la_CFLAGS = -O0
+
--- NEW FILE vlc-handlers.schemas ---
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mms/command</key>
<applyto>/desktop/gnome/url-handlers/mms/command</applyto>
<owner>vlc</owner>
<type>string</type>
<default>vlc "%s"</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mms/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/mms/needs_terminal</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mms/enabled</key>
<applyto>/desktop/gnome/url-handlers/mms/enabled</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtp/command</key>
<applyto>/desktop/gnome/url-handlers/rtp/command</applyto>
<owner>vlc</owner>
<type>string</type>
<default>vlc "%s"</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtp/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/rtp/needs_terminal</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtp/enabled</key>
<applyto>/desktop/gnome/url-handlers/rtp/enabled</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtsp/command</key>
<applyto>/desktop/gnome/url-handlers/rtsp/command</applyto>
<owner>vlc</owner>
<type>string</type>
<default>vlc "%s"</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtsp/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/rtsp/needs_terminal</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/rtsp/enabled</key>
<applyto>/desktop/gnome/url-handlers/rtsp/enabled</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mmsh/command</key>
<applyto>/desktop/gnome/url-handlers/mmsh/command</applyto>
<owner>vlc</owner>
<type>string</type>
<default>vlc "%s"</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mmsh/needs_terminal</key>
<applyto>/desktop/gnome/url-handlers/mmsh/needs_terminal</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/desktop/gnome/url-handlers/mmsh/enabled</key>
<applyto>/desktop/gnome/url-handlers/mmsh/enabled</applyto>
<owner>vlc</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short></short>
<long></long>
</locale>
</schema>
</schemalist>
</gconfschemafile>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 3 Apr 2009 19:32:03 -0000 1.8
+++ .cvsignore 23 Sep 2009 19:22:33 -0000 1.9
@@ -1 +1 @@
-vlc-0.9.9.tar.bz2
+vlc-1.0.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 3 Apr 2009 19:32:03 -0000 1.10
+++ sources 23 Sep 2009 19:22:33 -0000 1.11
@@ -1 +1 @@
-b7c2a75194ad5c73979c3d880aebbe38 vlc-0.9.9.tar.bz2
+6e9383e1684506ee2bfbfae011821fdd vlc-1.0.2.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-10/vlc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vlc.spec 9 Apr 2009 15:37:25 -0000 1.22
+++ vlc.spec 23 Sep 2009 19:22:33 -0000 1.23
@@ -1,51 +1,35 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
-%define _default_patch_fuzz 2
-%define with_internal_live555 0
-%define live555_date 2008.07.25
-%define vlc_git 0
-#define vlc_rc -rc2
-%define vlc_date 20090210
-%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
-%if %vlc_git
-Version: 1.0.0
-%define _version %{version}-git
-%define release_tag 0.1.%{vlc_date}git
-%else
-Version: 0.9.9
-%define _version %{version}
-%define release_tag 2
-%endif
-Release: %{release_tag}%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}.1
License: GPLv2+
Group: Applications/Multimedia
-URL: http://www.videolan.org/
-%if %vlc_git
-Source0: http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0024/vlc-sna...
-%else
-Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}%...
-%endif
-%if %with_internal_live555
+URL: http://www.videolan.org
+Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+%if 0%{?live555_date:1}
Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz
%endif
+Source10: vlc-handlers.schemas
Patch0: vlc-trunk-default_font.patch
-Patch1: vlc-0.9.2-pulse_default.patch
-Patch2: vlc-0.9.8a-embeddedvideo.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-pulse0071.patch
-Patch6: vlc-0.9.9-fix_playlist.patch
-Patch7: vlc-0.9.9-0.9.10git20090409.patch
+Patch5: vlc-1.0.2-compiler.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: desktop-file-utils
-%if 0
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: prelink
+
+%if 0%{?vlc_bootstrap:1}
BuildRequires: gettext-devel
BuildRequires: libtool
%endif
@@ -56,10 +40,8 @@
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel
-%{?_with_dirac: BuildRequires: dirac-devel >= 0.10.0 }
-%if %with_directfb
-BuildRequires: directfb-devel
-%endif
+BuildRequires: dirac-devel >= 1.0.0
+%{!?_without_directfb:BuildRequires: directfb-devel}
BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel >= 0.4.9-0
@@ -71,8 +53,8 @@
BuildRequires: gsm-devel
BuildRequires: hal-devel
BuildRequires: jack-audio-connection-kit-devel
-BuildRequires: libass-devel
BuildRequires: libavc1394-devel
+BuildRequires: libass-devel >= 0.9.7
BuildRequires: libcaca-devel
BuildRequires: libcddb-devel
BuildRequires: libcdio-devel >= 0.77-3
@@ -82,44 +64,48 @@
BuildRequires: libdvdnav-devel
BuildRequires: libebml-devel
BuildRequires: libid3tag-devel
-%{?_with_kate: BuildRequires: libkate-devel}
-BuildRequires: libmad-devel
+BuildRequires: libkate-devel
+BuildRequires: libmad-devel
BuildRequires: libmatroska-devel >= 0.7.6
BuildRequires: libmodplug-devel
BuildRequires: libmp4v2-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libmtp-devel
BuildRequires: libnotify-devel
+BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
+BuildRequires: libsmbclient-devel
BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiff-devel
BuildRequires: libupnp-devel
-%if 0%{?fedora} > 9
+%if 0%{?fedora} > 8
BuildRequires: libv4l-devel
%endif
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel
BuildRequires: lirc-devel
-%if %with_internal_live555
-BuildConflicts: live-devel
+%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
BuildRequires: lua-devel
+BuildRequires: minizip-devel
BuildRequires: mpeg2dec-devel >= 0.3.2
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
-BuildRequires: openslp-devel
+BuildRequires: openslp-devel
BuildRequires: pcre-devel
-BuildRequires: prelink
-BuildRequires: qt4-devel
+BuildRequires: pulseaudio-libs-devel >= 0.9.8
+BuildRequires: portaudio-devel
+BuildRequires: qt4-devel >= 4.5.2
BuildRequires: schroedinger-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
@@ -145,55 +131,29 @@
%ifarch %{ix86} x86_64
BuildRequires: libXvMC-devel
%endif
+BuildRequires: xcb-util-devel
BuildRequires: xorg-x11-proto-devel
-%if 0%{?fedora} > 6
-BuildRequires: libsmbclient-devel
-%else
-BuildRequires: samba-common
-%endif
-
-%if 0%{?fedora} > 7
-BuildRequires: pulseaudio-libs-devel >= 0.9.8
-BuildRequires: portaudio-devel
-%endif
-%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}
-# Now obsoleted as it will be built externally
-Obsoletes: java-vlc < 0.9.0
-Obsoletes: python-vlc < 0.9.0
-
-%if 0
-BuildRequires: libgoom2-devel
-BuildRequires: libggi-devel
-%endif
-
-%if %with_dc1394
-BuildRequires: compat-libdc1394-devel
-BuildRequires: compat-libraw1394-devel
-#else
-#BuildRequires: libraw1394-devel
-%endif
-
-
-Requires: vlc-core = %{version}-%{release}
%if 0%{?fedora} > 10
Requires: dejavu-sans-fonts
%else
Requires: dejavu-fonts
%endif
+Requires: qt-x11%{_isa} >= 1:4.5.2
+
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-core%{_isa} = %{version}-%{release}
%description
@@ -203,9 +163,6 @@
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
-Non-default rpmbuild options:
---with dirac: Enable dirac codec support
---with kate: Enable kate codec support
%description devel
@@ -217,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
@@ -233,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
@@ -245,50 +202,61 @@
%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.
+%package plugin-jack
+Summary: JACK audio plugin for VLC
+Group: Applications/Multimedia
+Requires: vlc-core%{_isa} = %{version}-%{release}
+
+%description plugin-jack
+JACK audio plugin for the VLC media player.
-%if %with_dc1394
-%package plugins-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 plugins-dc1394
-VLC plugins for libdc1394
-%endif
+%description plugin-dc1394
+VLC plugin for libdc1394
+}
%prep
-%setup -q -n %{name}-%{_version}%{?vlc_rc}
-%if %with_internal_live555
-%setup -q -D -T -a 2 -n %{name}-%{_version}%{?vlc_rc}
+%setup -q -n %{name}-%{version}%{?vlc_rc}
+%if 0%{?live555_date:1}
+%setup -q -D -T -a 2 -n %{name}-%{version}%{?vlc_rc}
%endif
%patch0 -p1 -b .default_font
-%if %vlc_git
-%else
-%patch1 -p1 -b .pulse_default
-%patch2 -p1 -b .embedded
+%patch1 -p1 -b .istrue
+%patch2 -p1 -b .defpa
#http://trac.videolan.org/vlc/ticket/1383
%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 .pulse0071
-%patch6 -p1 -b .pl
-%patch7 -p1 -b .git10
+%ifarch %{ix86} x86_64
+#https://bugzilla.redhat.com/show_bug.cgi?id=524439
+%patch5 -p1 -b .compiler
+%endif
-chmod -x modules/gui/qt4/qt4*
+#Workaround internal compiler bug in bd.c
+sed -i -e 's/screen bd zip/screen zip/' modules/access/Modules.am
-#./bootstrap
+rm modules/access/videodev2.h
+ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
+%if 0%{?vlc_bootstrap:1}
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
+./bootstrap
%endif
%build
-%if %with_internal_live555
+%if 0%{?live555_date:1}
# Then bundled live555 - not needed
pushd live
# Force the use of our CFLAGS
@@ -302,28 +270,23 @@
%configure \
--disable-dependency-tracking \
--disable-rpath \
- --enable-release \
+ --enable-debug \
+ --with-binary-version=%{version}-%{release} \
--with-tuning=no \
--enable-switcher \
- --enable-shout \
--enable-lua \
--enable-live555 \
-%if %with_internal_live555
+%if 0%{?live555_date:1}
--with-live555-tree=live \
%endif
-%if %with_dc1394
- --enable-dc1394 \
+%{?_with_dc1394:--enable-dc1394} \
--enable-dv \
-%endif
--enable-opencv \
- --enable-v4l \
--enable-pvr \
--enable-gnomevfs \
--enable-cddax \
-%if 0%{?fedora} < 8
- --disable-swscale \
- --enable-imgresample \
-%endif
+ --enable-wma-fixed \
+ --enable-shine \
--enable-faad \
--enable-twolame \
--enable-real \
@@ -333,24 +296,18 @@
--enable-speex \
--enable-tarkin \
--enable-theora \
- %{?_with_dirac:--enable-dirac} \
+ --enable-dirac \
--enable-libass \
- --enable-asademux \
+ --enable-xcb \
--enable-svg \
--enable-snapshot \
%ifarch %{ix86} x86_64
--enable-svgalib \
--enable-xvmc \
%endif
-%if %with_directfb
- --enable-directfb \
-%endif
+%{!?_without_directfb:--enable-directfb} \
--enable-aa \
--enable-caca \
-%if 0%{?fedora} < 9
- --enable-esd \
- --enable-arts \
-%endif
--enable-jack \
%if 0%{?fedora} > 7
--enable-portaudio \
@@ -366,9 +323,8 @@
%else
--without-contrib \
%endif
-%if %with_mozilla
- --enable-mozilla \
-%endif
+%{!?_without_mozilla:--enable-mozilla} \
+
# remove rpath from libtool
@@ -407,7 +363,7 @@
--mode 644 \
$RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop
-# Remove installed fonts for skin2 - needs
+# Remove installed fonts for skin2
rm -rf $RPM_BUILD_ROOT%{_datadir}/vlc/skin2/fonts/*.ttf
ln -sf ../../../fonts/dejavu/DejaVuSans.ttf \
$RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSans.ttf
@@ -415,11 +371,15 @@
$RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSansBold.ttf
#Clear execstak
-execstack -c $RPM_BUILD_ROOT%{_bindir}/vlc
+#execstack -c $RPM_BUILD_ROOT%{_bindir}/vlc
#Fix unowned directories
rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
+#Fix CGonf2 url-handler support
+#mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas
+install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/vlc/utils/
+
%find_lang %{name}
@@ -427,7 +387,22 @@
rm -rf $RPM_BUILD_ROOT
+%pre
+if [ "$1" -gt 1 ] ; then
+if [ -x %{_bindir}/gconftool-2 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-uninstall-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
+fi
+fi || :
+
+
%post
+if [ -x %{_bindir}/gconftool-2 ] ; then
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >/dev/null
+fi
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
@@ -436,6 +411,15 @@
%post core -p /sbin/ldconfig
+%preun
+if [ "$1" -eq 0 ]; then
+if [ -x %{_bindir}/gconftool-2 ] ; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule \
+ %{_datadir}/vlc/utils/vlc-handlers.schemas >& /dev/null
+fi
+fi || :
+
%postun
%{_bindir}/update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor
@@ -456,8 +440,7 @@
%{_bindir}/svlc
%{_libdir}/vlc/gui/libqt4_plugin.so
%{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
-%{_libdir}/vlc/access/libscreen_plugin.so
-%{_libdir}/vlc/codec/libfluidsynth_plugin.so
+%{_libdir}/vlc/access/libx11_screen_plugin.so
%{_libdir}/vlc/misc/libsvg_plugin.so
%{_libdir}/vlc/misc/libnotify_plugin.so
%{_libdir}/vlc/video_output/libaa_plugin.so
@@ -465,6 +448,9 @@
%{_libdir}/vlc/video_output/libglx_plugin.so
%{_libdir}/vlc/video_output/libopengl_plugin.so
%{_libdir}/vlc/video_output/libx11_plugin.so
+%{_libdir}/vlc/video_output/libxcb_plugin.so
+%{_libdir}/vlc/video_output/libxcb_window_plugin.so
+%{_libdir}/vlc/video_output/libxcb_xv_plugin.so
%{_libdir}/vlc/video_output/libxvideo_plugin.so
%{_libdir}/vlc/visualization/libgalaktos_plugin.so
%{_libdir}/vlc/misc/libxosd_plugin.so
@@ -490,7 +476,8 @@
%{_libdir}/*.so.*
%exclude %{_libdir}/vlc/gui/libqt4_plugin.so
%exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so
-%exclude %{_libdir}/vlc/access/libscreen_plugin.so
+%exclude %{_libdir}/vlc/access/libaccess_jack_plugin.so
+%exclude %{_libdir}/vlc/access/libx11_screen_plugin.so
%exclude %{_libdir}/vlc/codec/libfluidsynth_plugin.so
%exclude %{_libdir}/vlc/misc/libsvg_plugin.so
%exclude %{_libdir}/vlc/misc/libnotify_plugin.so
@@ -499,6 +486,9 @@
%exclude %{_libdir}/vlc/video_output/libglx_plugin.so
%exclude %{_libdir}/vlc/video_output/libopengl_plugin.so
%exclude %{_libdir}/vlc/video_output/libx11_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_window_plugin.so
+%exclude %{_libdir}/vlc/video_output/libxcb_xv_plugin.so
%exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so
%exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so
%exclude %{_libdir}/vlc/misc/libxosd_plugin.so
@@ -507,32 +497,43 @@
%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
%exclude %{_libdir}/vlc/video_filter/libpanoramix_plugin.so
+%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*
+%files plugin-jack
+%defattr(-,root,root,-)
+%{_libdir}/vlc/access/libaccess_jack_plugin.so
+%{_libdir}/vlc/audio_output/libportaudio_plugin.so
+%{_libdir}/vlc/audio_output/libjack_plugin.so
+%{_libdir}/vlc/codec/libfluidsynth_plugin.so
+
%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,-)
@@ -544,30 +545,100 @@
%{_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
-* Thu Apr 9 2009 kwizart < kwizart at gmail.com > - 0.9.9-2
-- Add Patch vlc-0.9.9-0.9.10git20090409.patch
+* Sun Sep 20 2009 kwizart < kwizart at gmail.com > - 1.0.2-1.1
+- Workaround the compiler bug on x86 x86_64 by disabling optimization.
-* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 0.9.9-1
-- Update to 0.9.9 final
-- backport playlist patch
-- Enable subtitles decoding
+* Sat Sep 19 2009 kwizart < kwizart at gmail.com > - 1.0.2-1
+- Update to 1.0.2
-* Tue Mar 16 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.5rc2
-- Use libxml2-static 2.6.2 from the Fedora GA repository
+* Wed Aug 12 2009 kwizart < kwizart at gmail.com > - 1.0.1-2
+- Conditionalize libass until stabilized ABI.
+- Update to 1.0-bugfix 20090812
+
+* 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)
+
+* Thu Jul 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.14rc4
+- Cherry pick from 1.0-bugfix
+- Move xcb modules into main
+- Move -devel Requirement from main to -core (Mutlilib fix)
+
+* Wed Jun 17 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.12rc4
+- Update to 1.0.0-rc4
+
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.11rc3
+- Update to 1.0.0-rc3
+
+* Fri Jun 5 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.10rc2
+- Move some module to avoid dependency
+- Remove previous signal-slot connection(s) if any - vlc trac #2818
+
+* Tue Jun 2 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.9rc2
+- Update to current bugfix
+- Revert b8f23ea716693d8d07dd8bd0cb4c9ba8ed05f568
+- Split plugin-jack
+
+* Wed May 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.7rc2
+- Update to 1.0.0-rc2
+- Rebase xulrunner patch for -rc2
+- Add GConf2 support for url-handler (based on totem)
+
+* Wed May 13 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.5rc1
+- Fix missing XvMC symbols
+- Fix export make_URI
+
+* Tue May 12 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.4rc1
+- Update to 1.0.0-rc1
+- Add 1.0-bugfix patches
+
+* Fri Apr 17 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.3pre2
+- Update to 1.0.0-pre2
+
+* Fri Apr 10 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.2pre1
+- Re-enable xxmc
+- Remove libmpeg2 out
+
+* Fri Mar 27 2009 kwizart < kwizart at gmail.com > - 1.0.0-0.1pre1
+- Update to 1.0.0-pre1
+- Add mozilla plugin with xulrunner-1.9.1. Patch from Alexey Gladkov
+- Disable xxmc
* Fri Mar 6 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.4rc2
- Update to 0.9.9-rc2
+
+* Fri Feb 27 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.3rc
+- Rename the Required font package.
+
+* Fri Feb 13 2009 kwizart < kwizart at gmail.com > - 0.9.9-0.1rc
+- Update to 0.9.9rc
+- Move Xless binaries to the -core subpackage
+- Add support for libxul 1.9.1
+
+* Fri Jan 16 2009 kwizart < kwizart at gmail.com > - 0.9.8a-3
+- Add libxul 1.9.1 preliminary support
+- backport postproc fixes
+- Add pending 0.9-bugfix git branch
- Add lua support by default
+* Thu Jan 15 2009 kwizart < kwizart at gmail.com > - 0.9.8a-2
+- Disable mozilla-vlc because of libxul 1.9.1 WIP
+- Rebuild for libcdio
+
* Fri Dec 5 2008 kwizart < kwizart at gmail.com > - 0.9.8a-1
- Update to 0.9.8a
Security update:
--- vlc-0.9.2-pulse_default.patch DELETED ---
--- vlc-0.9.8a-embeddedvideo.patch DELETED ---
--- vlc-0.9.9-0.9.10git20090409.patch DELETED ---
--- vlc-0.9.9-fix_playlist.patch DELETED ---
--- vlc-embeddedvideo.patch DELETED ---
--- vlc-pulse0071.patch DELETED ---
14 years, 10 months
rpms/sdlmame-data-samples/F-10 sdlmame-data-samples.spec, 1.4, 1.5 sources, 1.4, 1.5
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3402
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated safarir
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-10/sdlmame-data-samples.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sdlmame-data-samples.spec 22 Jul 2009 12:32:07 -0000 1.4
+++ sdlmame-data-samples.spec 22 Sep 2009 18:41:42 -0000 1.5
@@ -1,5 +1,5 @@
Name: sdlmame-data-samples
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
@@ -98,6 +98,9 @@
%changelog
+* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated safarir
+
* Wed Jul 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Added barrier, safarir and starhawk
- Split the source into individual files in order to make updating easier
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jul 2009 12:32:07 -0000 1.4
+++ sources 22 Sep 2009 18:41:42 -0000 1.5
@@ -29,7 +29,7 @@
a6c5b0d5b5196776b65f4f356f2ab9c0 rallyx.zip
026623c9bbe67e691ac1aed2403aa0f8 reactor.zip
22577132869566b333f21b01fc8309d3 ripoff.zip
-923f65bda3114c62806f9929fee881f0 safarir.zip
+9bfa9304043b38d6956c6ff8aa11388d safarir.zip
1fdabdf72326b4f2992666c915f60e55 sasuke.zip
9dcad5e656a6648e25cc6c127692279b seawolf.zip
d7894644ce50307307370abbd601fd37 sharkatt.zip
14 years, 10 months
rpms/sdlmame-data-samples/F-11 sdlmame-data-samples.spec, 1.5, 1.6 sources, 1.4, 1.5
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3301
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated safarir
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-11/sdlmame-data-samples.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdlmame-data-samples.spec 22 Jul 2009 12:31:58 -0000 1.5
+++ sdlmame-data-samples.spec 22 Sep 2009 18:41:32 -0000 1.6
@@ -1,5 +1,5 @@
Name: sdlmame-data-samples
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
@@ -98,6 +98,9 @@
%changelog
+* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated safarir
+
* Wed Jul 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Added barrier, safarir and starhawk
- Split the source into individual files in order to make updating easier
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jul 2009 12:31:58 -0000 1.4
+++ sources 22 Sep 2009 18:41:32 -0000 1.5
@@ -29,7 +29,7 @@
a6c5b0d5b5196776b65f4f356f2ab9c0 rallyx.zip
026623c9bbe67e691ac1aed2403aa0f8 reactor.zip
22577132869566b333f21b01fc8309d3 ripoff.zip
-923f65bda3114c62806f9929fee881f0 safarir.zip
+9bfa9304043b38d6956c6ff8aa11388d safarir.zip
1fdabdf72326b4f2992666c915f60e55 sasuke.zip
9dcad5e656a6648e25cc6c127692279b seawolf.zip
d7894644ce50307307370abbd601fd37 sharkatt.zip
14 years, 10 months
rpms/sdlmame-data-samples/devel sdlmame-data-samples.spec, 1.5, 1.6 sources, 1.4, 1.5
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame-data-samples/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3194
Modified Files:
sdlmame-data-samples.spec sources
Log Message:
* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
- Updated safarir
Index: sdlmame-data-samples.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/devel/sdlmame-data-samples.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sdlmame-data-samples.spec 22 Jul 2009 12:31:49 -0000 1.5
+++ sdlmame-data-samples.spec 22 Sep 2009 18:41:23 -0000 1.6
@@ -1,5 +1,5 @@
Name: sdlmame-data-samples
-Version: 0133
+Version: 0134
Release: 1%{?dist}
Summary: Sound samples for the SDLMAME package
@@ -98,6 +98,9 @@
%changelog
+* Tue Sep 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-1
+- Updated safarir
+
* Wed Jul 22 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-1
- Added barrier, safarir and starhawk
- Split the source into individual files in order to make updating easier
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame-data-samples/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jul 2009 12:31:49 -0000 1.4
+++ sources 22 Sep 2009 18:41:23 -0000 1.5
@@ -29,7 +29,7 @@
a6c5b0d5b5196776b65f4f356f2ab9c0 rallyx.zip
026623c9bbe67e691ac1aed2403aa0f8 reactor.zip
22577132869566b333f21b01fc8309d3 ripoff.zip
-923f65bda3114c62806f9929fee881f0 safarir.zip
+9bfa9304043b38d6956c6ff8aa11388d safarir.zip
1fdabdf72326b4f2992666c915f60e55 sasuke.zip
9dcad5e656a6648e25cc6c127692279b seawolf.zip
d7894644ce50307307370abbd601fd37 sharkatt.zip
14 years, 10 months
rpms/ogmrip/F-11 .cvsignore, 1.2, 1.3 ogmrip.spec, 1.1, 1.2 sources, 1.2, 1.3 ogmrip-0.12.2-configure_checks.patch, 1.1, NONE ogmrip-0.12.3-desktop.patch, 1.1, NONE
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3650
Modified Files:
.cvsignore ogmrip.spec sources
Removed Files:
ogmrip-0.12.2-configure_checks.patch
ogmrip-0.12.3-desktop.patch
Log Message:
* Mon Sep 21 2009 Gianluca Sforna <giallu gmail com> - 0.13.1-1
- New upstream release
- drop upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 May 2009 12:08:43 -0000 1.2
+++ .cvsignore 21 Sep 2009 22:23:18 -0000 1.3
@@ -1 +1 @@
-ogmrip-0.12.3.tar.gz
+ogmrip-0.13.1.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-11/ogmrip.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogmrip.spec 1 May 2009 12:08:43 -0000 1.1
+++ ogmrip.spec 21 Sep 2009 22:23:18 -0000 1.2
@@ -1,6 +1,6 @@
Name: ogmrip
-Version: 0.12.3
-Release: 3%{?dist}
+Version: 0.13.1
+Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -30,13 +30,11 @@
Requires: mkvtoolnix, lame
Requires: gpac
Requires: subtitleripper
+Requires: tesseract
Requires(post): GConf2
Requires(postun): GConf2
-Patch0: ogmrip-0.12.2-configure_checks.patch
-Patch1: ogmrip-0.12.3-desktop.patch
-
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
@@ -63,11 +61,6 @@
%prep
%setup -q
-%patch0 -p1 -b .configure_checks
-%patch1 -p1
-# Remove -Werror since build fails because of warn_unused_result otherwise
-# %{__perl} -pi -e 's|-Wall -Werror|-Wall|g' configure*
-
%build
@@ -123,6 +116,7 @@
%doc AUTHORS COPYING ChangeLog README TODO
%{_sysconfdir}/gconf/schemas/ogmrip.schemas
%{_bindir}/dvdcpy
+%{_bindir}/avibox
%{_bindir}/ogmrip
%{_bindir}/subp2pgm
%{_bindir}/subp2png
@@ -145,6 +139,20 @@
%changelog
+* Mon Sep 21 2009 Gianluca Sforna <giallu gmail com> - 0.13.1-1
+- New upstream release
+- drop upstreamed patches
+
+* Fri Aug 14 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-4
+- Require tesseract for subtitle extraction
+
+* Sun Jul 19 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-3
+- add patch to compile against gtk2-2.17.4
+
+* Fri Jul 17 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-1
+- New upstream release
+- drop upstreamed patches
+
* Mon Apr 20 2009 Gianluca Sforna <giallu gmail com> - 0.12.3-3
- Add Requires on -devel
- Find and remove .la files
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 May 2009 12:08:43 -0000 1.2
+++ sources 21 Sep 2009 22:23:18 -0000 1.3
@@ -1 +1 @@
-11a52e5d9d7f936ae3a1925b5ab51b72 ogmrip-0.12.3.tar.gz
+1c0db0bae74f28e646ca90933435d0b2 ogmrip-0.13.1.tar.gz
--- ogmrip-0.12.2-configure_checks.patch DELETED ---
--- ogmrip-0.12.3-desktop.patch DELETED ---
14 years, 10 months
rpms/ogmrip/devel .cvsignore, 1.3, 1.4 ogmrip.spec, 1.4, 1.5 sources, 1.3, 1.4 ogmrip-0.13.0-configure.patch, 1.1, NONE ogmrip-0.13.0-gtk-include.patch, 1.2, NONE
by Gianluca Sforna
Author: giallu
Update of /cvs/free/rpms/ogmrip/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2421
Modified Files:
.cvsignore ogmrip.spec sources
Removed Files:
ogmrip-0.13.0-configure.patch ogmrip-0.13.0-gtk-include.patch
Log Message:
* Mon Sep 21 2009 Gianluca Sforna <giallu gmail com> - 0.13.1-1
- New upstream release
- drop upstreamed patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 18 Jul 2009 14:31:55 -0000 1.3
+++ .cvsignore 21 Sep 2009 22:02:23 -0000 1.4
@@ -1 +1 @@
-ogmrip-0.13.0.tar.gz
+ogmrip-0.13.1.tar.gz
Index: ogmrip.spec
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/ogmrip.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ogmrip.spec 19 Jul 2009 08:43:59 -0000 1.4
+++ ogmrip.spec 21 Sep 2009 22:02:23 -0000 1.5
@@ -1,6 +1,6 @@
Name: ogmrip
-Version: 0.13.0
-Release: 3%{?dist}
+Version: 0.13.1
+Release: 1%{?dist}
Summary: DVD ripping and encoding graphical user interface
Group: Applications/Multimedia
@@ -30,13 +30,11 @@
Requires: mkvtoolnix, lame
Requires: gpac
Requires: subtitleripper
+Requires: tesseract
Requires(post): GConf2
Requires(postun): GConf2
-Patch0: http://ogmrip.sourceforge.net/patches/ogmrip-0.13.0-configure.patch
-Patch1: ogmrip-0.13.0-gtk-include.patch
-
%description
OGMRip is an application and a set of libraries for ripping and encoding DVDs
@@ -63,8 +61,6 @@
%prep
%setup -q
-%patch0 -p0 -b .configure
-%patch1 -p1 -b .gtk-include
%build
@@ -143,8 +139,15 @@
%changelog
+* Mon Sep 21 2009 Gianluca Sforna <giallu gmail com> - 0.13.1-1
+- New upstream release
+- drop upstreamed patches
+
+* Fri Aug 14 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-4
+- Require tesseract for subtitle extraction
+
* Sun Jul 19 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-3
-* add patch to compile against gtk2-2.17.4
+- add patch to compile against gtk2-2.17.4
* Fri Jul 17 2009 Gianluca Sforna <giallu gmail com> - 0.13.0-1
- New upstream release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ogmrip/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Jul 2009 14:31:56 -0000 1.3
+++ sources 21 Sep 2009 22:02:23 -0000 1.4
@@ -1 +1 @@
-ac1621923d92c6d1b865c4bfacd67ad0 ogmrip-0.13.0.tar.gz
+1c0db0bae74f28e646ca90933435d0b2 ogmrip-0.13.1.tar.gz
--- ogmrip-0.13.0-configure.patch DELETED ---
--- ogmrip-0.13.0-gtk-include.patch DELETED ---
14 years, 10 months
rpms/amule/F-10 .cvsignore, 1.6, 1.7 amule.spec, 1.9, 1.10 sources, 1.6, 1.7
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/amule/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26374
Modified Files:
.cvsignore amule.spec sources
Log Message:
* Sun Sep 20 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.6-1
- 2.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 19 May 2009 19:13:49 -0000 1.6
+++ .cvsignore 21 Sep 2009 19:28:31 -0000 1.7
@@ -1 +1 @@
-aMule-2.2.5.tar.bz2
+aMule-2.2.6.tar.bz2
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-10/amule.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amule.spec 19 May 2009 19:13:49 -0000 1.9
+++ amule.spec 21 Sep 2009 19:28:31 -0000 1.10
@@ -1,7 +1,7 @@
# TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
Name: amule
-Version: 2.2.5
+Version: 2.2.6
Release: 1%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
@@ -25,7 +25,7 @@
following platforms: Linux, *BSD and MacOS X.
%package nogui
-Summary: aMule components which don't require a GUI (for servers)
+Summary: Components of aMule which don't require a GUI (for servers)
Group: Applications/Internet
%description nogui
@@ -46,7 +46,12 @@
%prep
%setup -q -n aMule-%{version}
-
+manfiles=`find . -name "*.1"`
+for manfile in $manfiles; do
+ iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
+ touch -r $manfile $manfile.utf8
+ mv -f $manfile.utf8 $manfile
+done
%build
%configure \
@@ -160,6 +165,9 @@
%changelog
+* Sun Sep 20 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.6-1
+- 2.2.6
+
* Tue May 19 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.5-1
- 2.2.5
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 May 2009 19:13:49 -0000 1.6
+++ sources 21 Sep 2009 19:28:31 -0000 1.7
@@ -1 +1 @@
-d26048f8e00a1ca801b3b41156b4268d aMule-2.2.5.tar.bz2
+530d9b48187e36f78fc21bb19e94326d aMule-2.2.6.tar.bz2
14 years, 10 months
rpms/amule/F-11 .cvsignore, 1.6, 1.7 amule.spec, 1.9, 1.10 sources, 1.6, 1.7
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/amule/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25963
Modified Files:
.cvsignore amule.spec sources
Log Message:
* Sun Sep 20 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.6-1
- 2.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 19 May 2009 19:09:46 -0000 1.6
+++ .cvsignore 21 Sep 2009 19:27:56 -0000 1.7
@@ -1 +1 @@
-aMule-2.2.5.tar.bz2
+aMule-2.2.6.tar.bz2
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-11/amule.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- amule.spec 19 May 2009 19:09:46 -0000 1.9
+++ amule.spec 21 Sep 2009 19:27:56 -0000 1.10
@@ -1,7 +1,7 @@
# TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
Name: amule
-Version: 2.2.5
+Version: 2.2.6
Release: 1%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
@@ -25,7 +25,7 @@
following platforms: Linux, *BSD and MacOS X.
%package nogui
-Summary: aMule components which don't require a GUI (for servers)
+Summary: Components of aMule which don't require a GUI (for servers)
Group: Applications/Internet
%description nogui
@@ -46,7 +46,12 @@
%prep
%setup -q -n aMule-%{version}
-
+manfiles=`find . -name "*.1"`
+for manfile in $manfiles; do
+ iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
+ touch -r $manfile $manfile.utf8
+ mv -f $manfile.utf8 $manfile
+done
%build
%configure \
@@ -160,6 +165,9 @@
%changelog
+* Sun Sep 20 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.6-1
+- 2.2.6
+
* Tue May 19 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 2.2.5-1
- 2.2.5
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 May 2009 19:09:46 -0000 1.6
+++ sources 21 Sep 2009 19:27:56 -0000 1.7
@@ -1 +1 @@
-d26048f8e00a1ca801b3b41156b4268d aMule-2.2.5.tar.bz2
+530d9b48187e36f78fc21bb19e94326d aMule-2.2.6.tar.bz2
14 years, 10 months
rpms/xvidcore/F-10 xvidcore-1.2.1-noexec-stack.patch, NONE, 1.1 xvidcore.spec, 1.2, 1.3
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/xvidcore/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30117
Modified Files:
xvidcore.spec
Added Files:
xvidcore-1.2.1-noexec-stack.patch
Log Message:
* Mon Sep 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.2.1-3
- Do not require an executable stack on x86_64 (rf743, rf733)
xvidcore-1.2.1-noexec-stack.patch:
--- NEW FILE xvidcore-1.2.1-noexec-stack.patch ---
diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm
--- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -126,8 +126,4 @@ calc_cbp_mmx:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm
--- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2009-09-21 10:39:24.000000000 +0200
@@ -116,8 +116,4 @@ calc_cbp_sse2:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm
--- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-09-21 10:39:24.000000000 +0200
@@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW
MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm
--- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2009-09-21 10:39:24.000000000 +0200
@@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_
MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm
--- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2009-09-21 10:39:24.000000000 +0200
@@ -605,7 +605,4 @@ fdct_sse2_skal:
ENDFUNC
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm
--- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2009-09-21 10:39:24.000000000 +0200
@@ -698,8 +698,4 @@ idct_3dne:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm
--- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -608,8 +608,4 @@ idct_xmm:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm
--- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-09-21 10:39:24.000000000 +0200
@@ -325,8 +325,4 @@ idct_sse2_dmitry:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -514,8 +514,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4
MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1
MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0
MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm
--- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0,
MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1
MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm
--- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/deintl_sse.asm 2009-09-21 10:39:24.000000000 +0200
@@ -131,7 +131,4 @@ xvid_deinterlace_sse:
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm
--- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41:
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2009-09-21 10:39:24.000000000 +0200
@@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2009-09-21 10:39:24.000000000 +0200
@@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm
--- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2009-09-21 10:39:24.000000000 +0200
@@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm:
EPILOG
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm
--- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -114,7 +114,4 @@ image_brightness_mmx:
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm
--- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2009-09-21 10:39:24.000000000 +0200
@@ -130,7 +130,4 @@ image_brightness_sse2:
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm
--- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -1149,7 +1149,4 @@ ENDFUNC
%undef SRC_PTR
%undef DST_PTR
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm
--- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -985,8 +985,4 @@ ENDFUNC
; pfeewwww... Never Do That On Stage Again. :)
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm
--- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2009-09-21 10:39:24.000000000 +0200
@@ -216,8 +216,4 @@ sad8bi_3dn:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm
--- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2009-09-21 10:39:24.000000000 +0200
@@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm
--- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -731,8 +731,4 @@ sse8_8bit_mmx:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm
--- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2009-09-21 10:39:24.000000000 +0200
@@ -176,8 +176,4 @@ dev16_sse3:
MEAN16_SSE2_SSE3 lddqu
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm
--- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2009-09-21 10:39:24.000000000 +0200
@@ -436,8 +436,4 @@ sad16v_xmm:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc
--- xvidcore/src/nasm.inc.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/nasm.inc 2009-09-21 10:39:24.000000000 +0200
@@ -189,3 +189,12 @@ BITS 32
%endif
%endif
%endmacro
+
+%macro NON_EXEC_STACK 0
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%endmacro
diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm
--- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2009-09-21 10:39:24.000000000 +0200
@@ -273,6 +273,4 @@ consim_mmx:
ret
ENDFUNC
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm
--- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2009-09-21 10:39:24.000000000 +0200
@@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN
ret
ENDFUNC
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm
--- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm
--- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm
--- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-09-21 10:39:24.000000000 +0200
@@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm
--- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/utils/x86_asm/cpuid.asm 2009-09-21 10:39:24.000000000 +0200
@@ -240,7 +240,4 @@ ENDFUNC
%endif
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm
--- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -198,8 +198,4 @@ MBFieldTest_mmx:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm
--- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2009-09-21 10:39:24.000000000 +0200
@@ -465,8 +465,4 @@ transfer8x4_copy_3dne:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm
--- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200
+++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2009-09-21 10:39:24.000000000 +0200
@@ -588,8 +588,4 @@ transfer8x4_copy_mmx:
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: xvidcore.spec
===================================================================
RCS file: /cvs/free/rpms/xvidcore/F-10/xvidcore.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xvidcore.spec 28 Jan 2009 19:53:38 -0000 1.2
+++ xvidcore.spec 21 Sep 2009 10:30:51 -0000 1.3
@@ -1,12 +1,13 @@
Name: xvidcore
Version: 1.2.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: MPEG-4 Simple and Advanced Simple Profile codec
Group: System Environment/Libraries
License: GPLv2+
URL: http://www.xvid.org/
Source0: http://downloads.xvid.org/downloads/xvidcore-%{version}.tar.bz2
+Patch0: xvidcore-1.2.1-noexec-stack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch %{ix86} x86_64
@@ -34,6 +35,7 @@
%prep
%setup -q -n %{name}
+%patch0 -p1 -z .noexec-stack
chmod -x examples/*.pl
f=AUTHORS ; iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f && touch -r $f $f.utf8 && mv $f.utf8 $f
# Yes, we want to see the build output.
@@ -81,6 +83,12 @@
%changelog
+* Mon Sep 21 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 1.2.1-3
+- Do not require an executable stack on x86_64 (rf743, rf733)
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.2.1-2
+- rebuild for new F11 features
+
* Sat Dec 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.2.1-1
- 1.2.1
- drop upstreamed compilation fix
14 years, 10 months