[svn] r4607 - trunk/rpms/x264

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Tue Aug 1 13:43:06 CEST 2006 

Author: thias
Date: 2006-08-01 13:43:04 +0200 (Tue, 01 Aug 2006)
New Revision: 4607

Added:
   trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch
Removed:
   trunk/rpms/x264/x264-snapshot-20060607-2245-shared-lib.patch
Modified:
   trunk/rpms/x264/x264.spec
Log:
Update x264 and split off gtk frontend packages.


Deleted: trunk/rpms/x264/x264-snapshot-20060607-2245-shared-lib.patch
===================================================================
--- trunk/rpms/x264/x264-snapshot-20060607-2245-shared-lib.patch	2006-08-01 09:42:08 UTC (rev 4606)
+++ trunk/rpms/x264/x264-snapshot-20060607-2245-shared-lib.patch	2006-08-01 11:43:04 UTC (rev 4607)
@@ -1,12 +0,0 @@
-diff -Naupr x264-snapshot-20060607-2245.orig/Makefile x264-snapshot-20060607-2245/Makefile
---- x264-snapshot-20060607-2245.orig/Makefile	2006-06-07 22:45:02.000000000 +0200
-+++ x264-snapshot-20060607-2245/Makefile	2006-06-08 13:46:21.000000000 +0200
-@@ -142,7 +142,7 @@ install: x264 $(SONAME)
- 	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 	install x264 $(DESTDIR)$(bindir)
- 	ranlib $(DESTDIR)$(libdir)/libx264.a
--	$(if $(SONAME), ln -sf $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.so)
-+	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
- 	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
- 
- uninstall:

Added: trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch
===================================================================
--- trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch	2006-08-01 09:42:08 UTC (rev 4606)
+++ trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch	2006-08-01 11:43:04 UTC (rev 4607)
@@ -0,0 +1,52 @@
+diff -Naupr x264-snapshot-20060731-2245.orig/gtk/Makefile x264-snapshot-20060731-2245/gtk/Makefile
+--- x264-snapshot-20060731-2245.orig/gtk/Makefile	2006-07-31 22:45:02.000000000 +0200
++++ x264-snapshot-20060731-2245/gtk/Makefile	2006-08-01 12:43:29.000000000 +0200
+@@ -99,7 +99,7 @@ $(SONAMEGTK): $(OBJECTS_LIB)
+ $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TEST)
+ 	@echo "  B: $(@F)"
+ #Needs iconv/intl
+-	@$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB) -lintl
++	@$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB)
+ 
+ # Program : x264_gtk_encode
+ $(ENCODE_BIN): x264_icon.h libx264gtk.a $(SONAMEGTK) $(OBJECTS_ENCODE) $(EXTERNAL_DEPS) $(X264GTK_O)
+@@ -132,20 +132,26 @@ distclean:
+ 
+ # Install rule
+ install: x264_gtk_encode
++	@echo "  D: $(DESTDIR)$(includedir)"
++	@install -d "$(DESTDIR)$(includedir)"
+ 	@echo "  I: $(DESTDIR)$(includedir)/x264_gtk.h"
+ 	@install -m 644 x264_gtk.h "$(DESTDIR)$(includedir)"
+ 	@echo "  I: $(DESTDIR)$(includedir)/x264_gtk_enum.h"
+ 	@install -m 644 x264_gtk_enum.h "$(DESTDIR)$(includedir)"
++	@echo "  D: $(DESTDIR)$(libdir)"
++	@install -d "$(DESTDIR)$(libdir)"
+ 	@echo "  I: $(DESTDIR)$(libdir)/libx264gtk.a"
+ 	@install -m 644 libx264gtk.a "$(DESTDIR)$(libdir)"
+ 	@echo "  I: $(DESTDIR)$(libdir)/libx264gtk.so"
+ 	@$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.so)
+ 	@$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
++	@echo "  D: $(DESTDIR)$(bindir)"
++	@install -d "$(DESTDIR)$(bindir)"
+ 	@echo "  I: $(DESTDIR)$(bindir)/x264_gtk_encode"
+ 	@install x264_gtk_encode "$(DESTDIR)$(bindir)"
+-	@echo "  D: ${prefix}/share/x264"
++	@echo "  D: $(DESTDIR)${prefix}/share/x264"
+ 	@install -d "$(DESTDIR)${prefix}/share/x264"
+-	@echo "  I: ${prefix}/share/x264.png"
++	@echo "  I: $(DESTDIR)${prefix}/share/x264.png"
+ 	@install -m 644 x264.png "$(DESTDIR)${prefix}/share/x264"
+ 	@for L in $(ALL_LINGUAS); do \
+ 	  echo "  D: $(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES"; \
+@@ -153,7 +159,9 @@ install: x264_gtk_encode
+ 	  echo "  I: $(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES/x264_gtk.mo"; \
+ 	  install -m 644 $$L.mo "$(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES/x264_gtk.mo"; \
+ 	done
+-	@echo "  I: ${libdir}/pkgconfig/$(X264GTK_PC)"
++	@echo "  D: $(DESTDIR)${libdir}/pkgconfig"
++	@install -d "$(DESTDIR)${libdir}/pkgconfig"
++	@echo "  I: $(DESTDIR)${libdir}/pkgconfig/$(X264GTK_PC)"
+ 	@install -m 644 $(X264GTK_PC) "$(DESTDIR)${libdir}/pkgconfig"
+ 
+ # Uninstall rule

Modified: trunk/rpms/x264/x264.spec
===================================================================
--- trunk/rpms/x264/x264.spec	2006-08-01 09:42:08 UTC (rev 4606)
+++ trunk/rpms/x264/x264.spec	2006-08-01 11:43:04 UTC (rev 4607)
@@ -5,9 +5,10 @@
 %{?fedora: %{expand: %%define fc%{fedora} 1}}
 
 %{!?dist:%define _with_modxorg 1}
+%{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
-%define date 20060607
+%define date 20060731
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
@@ -17,37 +18,49 @@
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
 Source: ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{date}-2245.tar.bz2
-Patch0: x264-snapshot-20060607-2245-shared-lib.patch
+Patch0: x264-snapshot-20060731-2245-gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: nasm, yasm
-%if 0%{?_with_modxorg:1}
-BuildRequires: libXt-devel
-%else
-BuildRequires: XFree86-devel
-%endif
+BuildRequires: nasm, yasm, gtk2-devel, gettext
+%{?_with_visualize:%{?_with_modxorg:BuildRequires: libXt-devel}}
+%{?_with_visualize:%{!?_with_modxorg:BuildRequires: XFree86-devel}}
 # version.sh requires svnversion
 BuildRequires: subversion
 
 %description
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
+Utility and library for encoding H264/AVC video streams.
 
 
 %package devel
 Summary: Development files for the x264 library
 Group: Development/Libraries
-# Only an include file and a static lib, so don't require the main package
-#Requires: %{name} = %{version}
-Requires: pkgconfig
+Requires: %{name} = %{version}-%{release}, pkgconfig
 
 %description devel
-x264 is a free library for encoding H264/AVC video streams, written from
-scratch.
+This package contains the files required to develop programs that will encode
+H264/AVC video streams using the x264 library.
 
 
+%package gtk
+Summary: GTK x264 frontend
+Group: Applications/Multimedia
+
+%description gtk
+Graphical utility for encoding H264/AVC video streams.
+
+
+%package gtk-devel
+Summary: Development files for the GTK x264 frontend
+Group: Development/Libraries
+Requires: %{name}-gtk = %{version}-%{release}, pkgconfig
+
+%description gtk-devel
+This package contains the files required to develop programs that will encode
+H264/AVC video streams using the x264 graphical utility.
+
+
 %prep
 %setup -n %{name}-snapshot-%{date}-2245
-%patch0 -p1 -b .shared-lib
+%patch0 -p1 -b .gtk
 # configure hardcodes X11 lib path
 %{__perl} -pi -e 's|/usr/X11R6/lib |/usr/X11R6/%{_lib} |g' configure
 
@@ -59,8 +72,10 @@
     --bindir=%{_bindir} \
     --includedir=%{_includedir} \
     --libdir=%{_libdir} \
+    --enable-gtk \
     --enable-pthread \
     --enable-debug \
+    %{?_with_visualize:--enable-visualize} \
     --enable-pic \
     --enable-shared \
     --extra-cflags="%{optflags}"
@@ -69,7 +84,8 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
+%find_lang x264_gtk
 
 
 %clean
@@ -89,14 +105,36 @@
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING
+%doc doc/*.txt
 %{_includedir}/x264.h
 %{_libdir}/pkgconfig/x264.pc
 %{_libdir}/libx264.a
 %{_libdir}/libx264.so
 
+%files gtk -f x264_gtk.lang
+%defattr(-, root, root, 0755)
+%doc AUTHORS COPYING
+%{_bindir}/x264_gtk_encode
+%{_libdir}/libx264gtk.so.*
+%{_datadir}/x264/x264.png
 
+%files gtk-devel
+%defattr(-, root, root, 0755)
+%doc doc/*.txt
+%{_includedir}/x264_gtk.h
+%{_includedir}/x264_gtk_enum.h
+%{_libdir}/pkgconfig/x264gtk.pc
+%{_libdir}/libx264gtk.a
+%{_libdir}/libx264gtk.so
+
+
 %changelog
+* Tue Aug  1 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060731
+- Update to 20060731 snapshot.
+- Require the main package from the devel since we have a shared lib now.
+- Remove no longer needed symlink patch.
+- Enable gtk, include patch to have it build, and split off sub-packages.
+
 * Thu Jun  8 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060607
 - Switch to using the official snapshots.
 - Remove no longer needed UTF-8 AUTHORS file conversion.

More information about the svn-commits mailing list