Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder/files: x264-encoder-nolib-20110223.patch
Date: Thu, 24 Feb 2011 13:26:39
Message-Id: 20110224132629.B2DB820057@flycatcher.gentoo.org
1 aballier 11/02/24 13:26:29
2
3 Added: x264-encoder-nolib-20110223.patch
4 Log:
5 bump a new snapshot
6
7 (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-video/x264-encoder/files/x264-encoder-nolib-20110223.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20110223.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20110223.patch?rev=1.1&content-type=text/plain
14
15 Index: x264-encoder-nolib-20110223.patch
16 ===================================================================
17 Index: x264-snapshot-20110223-2245/Makefile
18 ===================================================================
19 --- x264-snapshot-20110223-2245.orig/Makefile
20 +++ x264-snapshot-20110223-2245/Makefile
21 @@ -146,8 +146,8 @@ libx264.a: .depend $(OBJS) $(OBJASM)
22 $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
23 $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
24
25 -x264$(EXE): $(OBJCLI) libx264.a
26 - $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS)
27 +x264$(EXE): $(OBJCLI)
28 + $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) `pkg-config --libs x264`
29
30 checkasm: tools/checkasm.o libx264.a
31 $(CC) -o $@ $+ $(LDFLAGS)
32 @@ -214,22 +214,7 @@ distclean: clean
33
34 install: x264$(EXE) $(SONAME)
35 install -d $(DESTDIR)$(bindir)
36 - install -d $(DESTDIR)$(includedir)
37 - install -d $(DESTDIR)$(libdir)
38 - install -d $(DESTDIR)$(libdir)/pkgconfig
39 - install -m 644 x264.h $(DESTDIR)$(includedir)
40 - install -m 644 x264_config.h $(DESTDIR)$(includedir)
41 - install -m 644 libx264.a $(DESTDIR)$(libdir)
42 - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
43 install x264$(EXE) $(DESTDIR)$(bindir)
44 - $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
45 -ifeq ($(SYS),MINGW)
46 - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
47 -else
48 - $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
49 - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
50 -endif
51 - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
52
53 uninstall:
54 rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a