rpms/x264/F-10 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 x264.spec, 1.4, 1.5

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/x264/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9296

Modified Files:
	.cvsignore sources x264.spec 
Log Message:
* Sun Feb 08 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.19.20080905
- don't require gpac-devel unconditionally
- bring back x86 asm optimized libs split
- drop gui-devel subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2008 10:20:21 -0000	1.3
+++ .cvsignore	10 Feb 2009 22:17:20 -0000	1.4
@@ -1 +1,2 @@
 x264-20080905.tar.bz2
+x264icon.png


Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2008 10:20:21 -0000	1.3
+++ sources	10 Feb 2009 22:17:20 -0000	1.4
@@ -1 +1,2 @@
 09795824d0c28bf221ba96ebeb971ed2  x264-20080905.tar.bz2
+47946ad85c1f8be7397f328787468aad  x264icon.png


Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-10/x264.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264.spec	17 Nov 2008 20:20:29 -0000	1.4
+++ x264.spec	10 Feb 2009 22:17:20 -0000	1.5
@@ -3,13 +3,15 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.18.%{snapshot}%{?dist}
+Release: 0.19.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
 Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
 Source2: %{name}.desktop
+# converted from gtk/x264.ico and made background transparent
+Source3: %{name}icon.png
 Patch0: %{name}-rpm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: desktop-file-utils
@@ -17,8 +19,7 @@
 BuildRequires: git-core
 BuildRequires: gtk2-devel
 BuildRequires: gettext
-BuildRequires: gpac-devel
-BuildRequires: ImageMagick
+%{?_with_gpac:BuildRequires: gpac-devel}
 %ifarch x86_64 %{ix86}
 BuildRequires: yasm
 %endif
@@ -58,6 +59,7 @@
 Requires(postun): /sbin/ldconfig
 Obsoletes: %{name}-gtk < %{version}-%{release}
 Provides: %{name}-gtk = %{version}-%{release}
+Obsoletes: %{name}-gui-devel < 0.0.0-0.19
 
 %description gui
 x264 is a free library for encoding H264/AVC video streams, written from
@@ -65,21 +67,6 @@
 
 This package contains the GTK GUI.
 
-%package gui-devel
-Summary: Development files for the x264 encoder GUI
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-gui = %{version}-%{release}
-Requires: pkgconfig
-Obsoletes: %{name}-gtk-devel < %{version}-%{release}
-Provides: %{name}-gtk-devel = %{version}-%{release}
-
-%description gui-devel
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
-
-This package contains the GUI development files.
-
 %define x_configure \
 ./configure \\\
 	--host=%{_target_platform} \\\
@@ -102,14 +89,31 @@
 # AUTHORS file is in iso-8859-1
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 mv -f AUTHORS.utf8 AUTHORS
-convert gtk/x264.ico x264icon.png
+%ifarch %{ix86}
+mkdir simd
+cp -a `ls -1|grep -v simd` simd/
+%endif
 
 %build
 %{x_configure}\
+	--host=%{_target_platform} \
 	--libdir=%{_libdir} \
 	--enable-gtk \
+%ifarch %{ix86}
+	--disable-asm \
+%endif
+
+%{__make} %{?_smp_mflags}
+
+%ifarch %{ix86}
+pushd simd
+%{x_configure}\
+	--host=`echo %{_target_platform}|sed -e 's/i.86/i686/'` \
+	--libdir=%{_libdir}/i686 \
 
 %{__make} %{?_smp_mflags}
+popd
+%endif
 
 %install
 %{__rm} -rf %{buildroot}
@@ -120,10 +124,18 @@
 	--mode 644					\
 	%{SOURCE2}
 
-%{__install} -Dpm 644 x264icon.png \
+%{__install} -Dpm 644 %{SOURCE3} \
 	%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %find_lang %{name}_gtk
+rm %{buildroot}{%{_includedir}/x264_gtk*.h,%{_libdir}/{libx264gtk.so,pkgconfig/%{name}gtk.pc}}
+
+%ifarch %{ix86}
+pushd simd
+%{__make} DESTDIR=%{buildroot} install
+rm %{buildroot}%{_libdir}/i686/pkgconfig/x264.pc
+popd
+%endif
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -154,6 +166,9 @@
 %files libs
 %defattr(644, root, root, 0755)
 %{_libdir}/libx264.so.*
+%ifarch %{ix86}
+%{_libdir}/i686/libx264.so.*
+%endif
 
 %files devel
 %defattr(644, root, root, 0755)
@@ -161,6 +176,9 @@
 %{_includedir}/x264.h
 %{_libdir}/libx264.so
 %{_libdir}/pkgconfig/%{name}.pc
+%ifarch %{ix86}
+%{_libdir}/i686/libx264.so
+%endif
 
 %files gui -f %{name}_gtk.lang
 %defattr(644, root, root, 0755)
@@ -170,13 +188,12 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/x264.png
 
-%files gui-devel
-%defattr(644, root, root, 0755)
-%{_includedir}/x264_gtk*.h
-%{_libdir}/libx264gtk.so
-%{_libdir}/pkgconfig/%{name}gtk.pc
-
 %changelog
+* Sun Feb 08 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.19.20080905
+- don't require gpac-devel unconditionally
+- bring back x86 asm optimized libs split
+- drop gui-devel subpackage
+
 * Mon Nov 17 2008 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.18.20080905
 - partially revert latest changes (the separate sse2 libs part) until selinux
   policy catches up