* [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nostrip.patch x264-encoder-nolib.patch x264-encoder-nolib-20080406.patch
@ 2008-04-07 21:50 Ben de Groot (yngwin)
0 siblings, 0 replies; only message in thread
From: Ben de Groot (yngwin) @ 2008-04-07 21:50 UTC (permalink / raw
To: gentoo-commits
yngwin 08/04/07 21:50:35
Added: x264-encoder-nostrip.patch x264-encoder-nolib.patch
x264-encoder-nolib-20080406.patch
Log:
Pkgmove from x264-svn-encoder to x264-encoder, and adding fresh snapshot
(Portage version: 2.1.5_rc2, RepoMan options: --force)
Revision Changes Path
1.1 media-video/x264-encoder/files/x264-encoder-nostrip.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nostrip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nostrip.patch?rev=1.1&content-type=text/plain
Index: x264-encoder-nostrip.patch
===================================================================
Index: x264-svn/configure
===================================================================
--- x264-svn.orig/configure
+++ x264-svn/configure
@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then
ASFLAGS="$ASFLAGS -D__PIC__"
fi
-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
- CFLAGS="$CFLAGS -s -fomit-frame-pointer"
- LDFLAGS="$LDFLAGS -s"
-fi
-
if [ "$debug" = "yes" ]; then
CFLAGS="-O1 -g $CFLAGS"
else
1.1 media-video/x264-encoder/files/x264-encoder-nolib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib.patch?rev=1.1&content-type=text/plain
Index: x264-encoder-nolib.patch
===================================================================
Index: x264-svn/Makefile
===================================================================
--- x264-svn.orig/Makefile
+++ x264-svn/Makefile
@@ -75,10 +75,10 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+x264$(EXE): $(OBJCLI)
+ $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
-libx264gtk.a: muxers.o libx264.a
+libx264gtk.a: muxers.o
$(MAKE) -C gtk
checkasm: tools/checkasm.o libx264.a
@@ -142,16 +142,10 @@ distclean: clean
rm -rf test/
$(MAKE) -C gtk distclean
-install: x264 $(SONAME)
+install: x264
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 $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
install-gtk: libx264gtk.a
$(MAKE) -C gtk install
Index: x264-svn/configure
===================================================================
--- x264-svn.orig/configure
+++ x264-svn/configure
@@ -423,7 +423,6 @@ cp config.mak gtk/config.mak
if [ "$shared" = "yes" ]; then
API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
echo "SONAME=libx264.so.$API" >> config.mak
- echo 'default: $(SONAME)' >> config.mak
if [ "$gtk" = "yes" ]; then
echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
fi
Index: x264-svn/gtk/Makefile
===================================================================
--- x264-svn.orig/gtk/Makefile
+++ x264-svn/gtk/Makefile
@@ -46,14 +46,14 @@ SOURCES_ALL = $(OBJECTS_ALL:%.o=%.c)
X264GTK_PC = x264gtk.pc
-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
+EXTERNAL_DEPS= ../muxers.o ../matroska.o
all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
# Already provides iconv/intl
CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
# gettext rules
1.1 media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20080406.patch?rev=1.1&content-type=text/plain
Index: x264-encoder-nolib-20080406.patch
===================================================================
diff -rub x264.orig/configure x264/configure
--- x264.orig/configure 2008-04-07 22:20:37.000000000 +0200
+++ x264/configure 2008-04-07 22:34:00.000000000 +0200
@@ -465,7 +465,6 @@
echo "SONAME=libx264.so.$API" >> config.mak
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
fi
- echo 'default: $(SONAME)' >> config.mak
if [ "$gtk" = "yes" ]; then
echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
fi
diff -rub x264.orig/gtk/Makefile x264/gtk/Makefile
--- x264.orig/gtk/Makefile 2008-04-07 22:22:20.000000000 +0200
+++ x264/gtk/Makefile 2008-04-07 22:34:08.000000000 +0200
@@ -46,14 +46,14 @@
X264GTK_PC = x264gtk.pc
-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
+EXTERNAL_DEPS= ../muxers.o ../matroska.o
all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
# Already provides iconv/intl
CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
# gettext rules
diff -rub x264.orig/Makefile x264/Makefile
--- x264.orig/Makefile 2008-04-07 22:20:23.000000000 +0200
+++ x264/Makefile 2008-04-07 22:33:49.000000000 +0200
@@ -78,10 +78,10 @@
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+x264$(EXE): $(OBJCLI)
+ $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
-libx264gtk.a: muxers.o libx264.a
+libx264gtk.a: muxers.o
$(MAKE) -C gtk
checkasm: tools/checkasm.o libx264.a
@@ -148,21 +148,10 @@
rm -rf test/
$(MAKE) -C gtk distclean
-install: x264$(EXE) $(SONAME)
+install: x264$(EXE)
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
- $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
-endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
install-gtk: libx264gtk.a
$(MAKE) -C gtk install
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-07 21:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-07 21:50 [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nostrip.patch x264-encoder-nolib.patch x264-encoder-nolib-20080406.patch Ben de Groot (yngwin)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox