* [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nolib-20110425.patch
@ 2011-04-27 17:20 Alexis Ballier (aballier)
0 siblings, 0 replies; only message in thread
From: Alexis Ballier (aballier) @ 2011-04-27 17:20 UTC (permalink / raw
To: gentoo-commits
aballier 11/04/27 17:20:43
Added: x264-encoder-nolib-20110425.patch
Log:
new snapshot
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Revision Changes Path
1.1 media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20110425.patch?rev=1.1&content-type=text/plain
Index: x264-encoder-nolib-20110425.patch
===================================================================
Index: x264-snapshot-20110425-2245/Makefile
===================================================================
--- x264-snapshot-20110425-2245.orig/Makefile
+++ x264-snapshot-20110425-2245/Makefile
@@ -146,8 +146,8 @@ $(LIBX264): .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) $(LIBX264)
- $(LD)$@ $+ $(LDFLAGSCLI) $(LDFLAGS)
+x264$(EXE): $(OBJCLI)
+ $(LD)$@ $+ $(LDFLAGSCLI) $(LDFLAGS) `pkg-config --libs x264`
checkasm: tools/checkasm.o $(LIBX264)
$(LD)$@ $+ $(LDFLAGS)
@@ -209,22 +209,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 x264_config.h $(DESTDIR)$(includedir)
- install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
- install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
install x264$(EXE) $(DESTDIR)$(bindir)
- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
-ifeq ($(SYS),WINDOWS)
- $(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)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-27 17:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 17:20 [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nolib-20110425.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