1 |
aballier 10/10/30 16:25:36 |
2 |
|
3 |
Added: x264-encoder-nolib-20101029.patch |
4 |
Log: |
5 |
version bump |
6 |
|
7 |
(Portage version: 2.2.0_alpha2/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-video/x264-encoder/files/x264-encoder-nolib-20101029.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20101029.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20101029.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: x264-encoder-nolib-20101029.patch |
16 |
=================================================================== |
17 |
Index: x264-snapshot-20101029-2245/Makefile |
18 |
=================================================================== |
19 |
--- x264-snapshot-20101029-2245.orig/Makefile |
20 |
+++ x264-snapshot-20101029-2245/Makefile |
21 |
@@ -135,8 +135,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 |
@@ -203,21 +203,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 libx264.a $(DESTDIR)$(libdir) |
41 |
- install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig |
42 |
install x264$(EXE) $(DESTDIR)$(bindir) |
43 |
- $(RANLIB) $(DESTDIR)$(libdir)/libx264.a |
44 |
-ifeq ($(SYS),MINGW) |
45 |
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) |
46 |
-else |
47 |
- $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) |
48 |
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) |
49 |
-endif |
50 |
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) |
51 |
|
52 |
uninstall: |
53 |
rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a |