rpms
/
x264
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fri Sep 05 2008 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.16.20080905

Browse Source 
- 20080905 snapshot
- use yasm on all supported arches
- include mp4 output support via gpac by default
- drop/move obsolete fixups from %prep
- fix icon filename in desktop file
el8
Dominik Mierzejewski 17 years ago
parent a1ed3743ec
commit f7cb4c3b49
5 changed files with 106 additions and 95 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
x264-20080613.tar.bz2
x264-20080905.tar.bz2

2
sources
Unescape View File

@ -1 +1 @@
265f24d6f91d5ba0b448ed63c59d03fb x264-20080613.tar.bz2
09795824d0c28bf221ba96ebeb971ed2 x264-20080905.tar.bz2

173
x264-rpm.patch
Unescape View File

@ -1,60 +1,43 @@
diff -up x264-20080420/Makefile.r x264-20080420/Makefile
--- x264-20080420/Makefile.r 2008-04-20 00:21:48.000000000 +0200
+++ x264-20080420/Makefile 2008-05-04 21:39:38.000000000 +0200
@@ -69,7 +69,7 @@ DEP = depend
.PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
-default: $(DEP) x264$(EXE)
+default: $(DEP) x264$(EXE) x264_gtk_encode$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
@@ -77,15 +77,16 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
+ ln -s $(SONAME) libx264.so
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+x264$(EXE): $(OBJCLI) $(SONAME)
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
-libx264gtk.a: muxers.o libx264.a
+x264_gtk_encode$(EXE): muxers.o $(SONAME)
$(MAKE) -C gtk
-checkasm: tools/checkasm.o libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+checkasm: tools/checkasm.o $(SONAME)
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
diff -up x264-20080905/configure.r x264-20080905/configure
--- x264-20080905/configure.r 2008-09-05 11:30:52.000000000 +0200
+++ x264-20080905/configure 2008-09-05 11:43:27.000000000 +0200
@@ -158,7 +158,7 @@ for opt do
shared="yes"
;;
--enable-visualize)
- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+ LDFLAGS="$LDFLAGS -lX11"
CFLAGS="$CFLAGS -DVISUALIZE=1"
vis="yes"
;;
@@ -243,6 +243,7 @@ esac
case $host_cpu in
i*86)
ARCH="X86"
+ LDFLAGS="$LDFLAGS -m32"
AS="yasm"
ASFLAGS="-O2"
if [ "$SYS" = MACOSX ]; then
@@ -363,7 +364,7 @@ if test "$pthread" = "yes" ; then
LDFLAGS="$LDFLAGS $libpthread"
fi
%.o: %.asm
$(AS) $(ASFLAGS) -o $@ $<
@@ -152,10 +153,8 @@ install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
- install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264$(EXE) $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
ifeq ($(SYS),MINGW)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
else
@@ -164,7 +163,7 @@ else
endif
$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
-MP4_LDFLAGS="-lgpac_static"
+MP4_LDFLAGS="-lgpac"
if [ $SYS = MINGW ]; then
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
fi
@@ -478,7 +479,6 @@ if [ "$shared" = "yes" ]; then
fi
-install-gtk: libx264gtk.a
+install-gtk: x264_gtk_encode$(EXE)
$(MAKE) -C gtk install
if [ "$gtk" = "yes" ]; then
- echo 'default: libx264gtk.a' >> config.mak
echo 'install: install-gtk' >> config.mak
fi
uninstall:
diff -up x264-20080420/gtk/Makefile.r x264-20080420/gtk/Makefile
--- x264-20080420/gtk/Makefile.r 2008-04-20 00:21:48.000000000 +0200
+++ x264-20080420/gtk/Makefile 2008-05-04 21:34:42.000000000 +0200
diff -up x264-20080905/gtk/Makefile.r x264-20080905/gtk/Makefile
--- x264-20080905/gtk/Makefile.r 2008-09-05 11:30:52.000000000 +0200
+++ x264-20080905/gtk/Makefile 2008-09-05 11:41:36.000000000 +0200
@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
X264GTK_PC = x264gtk.pc
@ -83,7 +66,7 @@ diff -up x264-20080420/gtk/Makefile.r x264-20080420/gtk/Makefile
-
$(SONAMEGTK): $(OBJECTS_LIB)
@echo " L: $(@F)"
@$(CC) -shared -o $@ $(OBJECTS_LIB) -Wl,-soname,$(SONAMEGTK) $(LDFLAGS)
@$(CC) -shared -o $@ $(OBJECTS_LIB) $(SOFLAGS) $(LDFLAGS)
@@ -102,7 +97,7 @@ $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TE
@$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB)
@ -123,34 +106,60 @@ diff -up x264-20080420/gtk/Makefile.r x264-20080420/gtk/Makefile
@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)
@echo " I: $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX)"
@$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.$(SOSUFFIX))
@$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
diff -up x264-20080420/configure.r x264-20080420/configure
--- x264-20080420/configure.r 2008-04-20 00:21:48.000000000 +0200
+++ x264-20080420/configure 2008-05-04 21:35:24.000000000 +0200
@@ -235,6 +235,7 @@ esac
case $host_cpu in
i*86)
ARCH="X86"
+ LDFLAGS="$LDFLAGS -m32"
AS="yasm"
ASFLAGS="-O2"
if [ "$SYS" = MACOSX ]; then
@@ -372,7 +373,7 @@ if test "$pthread" = "yes" ; then
LDFLAGS="$LDFLAGS $libpthread"
fi
diff -up x264-20080905/Makefile.r x264-20080905/Makefile
--- x264-20080905/Makefile.r 2008-09-05 11:30:52.000000000 +0200
+++ x264-20080905/Makefile 2008-09-05 11:41:36.000000000 +0200
@@ -71,7 +71,7 @@ DEP = depend
-MP4_LDFLAGS="-lgpac_static"
+MP4_LDFLAGS="-lgpac"
if [ $SYS = MINGW ]; then
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
fi
@@ -477,7 +478,6 @@ if [ "$shared" = "yes" ]; then
fi
.PHONY: all default fprofiled clean distclean install install-gtk uninstall dox test testclean
if [ "$gtk" = "yes" ]; then
- echo 'default: libx264gtk.a' >> config.mak
echo 'install: install-gtk' >> config.mak
fi
-default: $(DEP) x264$(EXE)
+default: $(DEP) x264$(EXE) x264_gtk_encode$(EXE)
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
@@ -79,15 +79,16 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
+ ln -s $(SONAME) libx264.so
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+x264$(EXE): $(OBJCLI) $(SONAME)
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
-libx264gtk.a: muxers.o libx264.a
+x264_gtk_encode$(EXE): muxers.o $(SONAME)
$(MAKE) -C gtk
-checkasm: tools/checkasm.o libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+checkasm: tools/checkasm.o $(SONAME)
+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L.
%.o: %.asm
$(AS) $(ASFLAGS) -o $@ $<
@@ -154,10 +155,8 @@ install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
install -m 644 x264.h $(DESTDIR)$(includedir)
- install -m 644 libx264.a $(DESTDIR)$(libdir)
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264$(EXE) $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
ifeq ($(SYS),MINGW)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
else
@@ -166,7 +165,7 @@ else
endif
$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
-install-gtk: libx264gtk.a
+install-gtk: x264_gtk_encode$(EXE)
$(MAKE) -C gtk install
uninstall:

2
x264.desktop
Unescape View File

@ -4,7 +4,7 @@ GenericName=Video encoder
Comment=Gtk+ interface to configure X264
Exec=x264_gtk_encode
Terminal=false
Icon=x264.png
Icon=x264
Type=Application
Encoding=UTF-8
Categories=Video;AudioVideoEditing;GTK;

22
x264.spec
Unescape View File

@ -1,9 +1,9 @@
%define snapshot 20080613
%define snapshot 20080905
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
Release: 0.15.%{snapshot}%{?dist}
Release: 0.16.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@ -17,14 +17,11 @@ BuildRequires: desktop-file-utils
BuildRequires: git-core
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: gpac-devel
BuildRequires: ImageMagick
%ifarch %{ix86}
BuildRequires: nasm
%endif
%ifarch x86_64
%ifarch x86_64 %{ix86}
BuildRequires: yasm
%endif
%{?_with_gpac:BuildRequires: gpac-devel}
%description
x264 is a free library for encoding H264/AVC video streams, written from
@ -88,13 +85,11 @@ This package contains the GUI development files.
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
# configure hardcodes X11 lib path
%{__perl} -pi -e 's|/usr/X11R6/lib |%{_libdir} |g' configure
%{__perl} -pi -e 's|^MACHINE=.*|MACHINE=%{_build}|' configure
convert gtk/x264.ico x264icon.png
%build
./configure \
--host=%{_target_platform} \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} \
@ -177,6 +172,13 @@ fi
%{_libdir}/pkgconfig/%{name}gtk.pc
%changelog
* Fri Sep 05 2008 Dominik Mierzejewski <rpm@greysector.net> 0.0.0-0.16.20080905
- 20080905 snapshot
- use yasm on all supported arches
- include mp4 output support via gpac by default
- drop/move obsolete fixups from %%prep
- fix icon filename in desktop file
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.0.0-0.15.20080613
- rebuild

Write Preview
Loading…
Cancel
Save