* [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nolib-20100605.patch
@ 2010-06-06 10:37 Alexis Ballier (aballier)
0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2010-06-06 10:37 UTC (permalink / raw
To: gentoo-commits
aballier 10/06/06 10:37:56
Added: x264-encoder-nolib-20100605.patch
Log:
bump a new snapshot
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/x264-encoder/files/x264-encoder-nolib-20100605.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20100605.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20100605.patch?rev=1.1&content-type=text/plain
Index: x264-encoder-nolib-20100605.patch
===================================================================
Index: x264-snapshot-20100605-2245/Makefile
===================================================================
--- x264-snapshot-20100605-2245.orig/Makefile
+++ x264-snapshot-20100605-2245/Makefile
@@ -127,8 +127,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
+x264$(EXE): $(OBJCLI)
+ $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI) `pkg-config --libs x264`
checkasm: tools/checkasm.o libx264.a
$(CC) -o $@ $+ $(LDFLAGS)
@@ -195,21 +195,7 @@ distclean: clean
install: x264$(EXE) $(SONAME)
install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(includedir)
- install -d $(DESTDIR)$(libdir)
- install -d $(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 -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
-endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
uninstall:
rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-06-06 10:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-06 10:37 [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nolib-20100605.patch Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox