Contents of /trunk/x264/patches/x264-20070106_2245-no-libs.patch
Parent Directory | Revision Log
Revision 412 -
(show annotations)
(download)
Wed Nov 14 15:14:56 2007 UTC (16 years, 10 months ago) by niro
File size: 2662 byte(s)
Wed Nov 14 15:14:56 2007 UTC (16 years, 10 months ago) by niro
File size: 2662 byte(s)
-split package to fix depwalker loops on resolving srcinstall deps
1 | diff -Naur x264-snapshot-20070106-2245/Makefile x264-snapshot-20070106-2245-magellan/Makefile |
2 | --- x264-snapshot-20070106-2245/Makefile 2007-01-06 22:45:02.000000000 +0100 |
3 | +++ x264-snapshot-20070106-2245-magellan/Makefile 2007-11-14 15:21:20.000000000 +0100 |
4 | @@ -73,10 +73,10 @@ |
5 | $(SONAME): .depend $(OBJS) $(OBJASM) |
6 | $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) |
7 | |
8 | -x264$(EXE): $(OBJCLI) libx264.a |
9 | - $(CC) -o $@ $+ $(LDFLAGS) |
10 | +x264$(EXE): $(OBJCLI) |
11 | + $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264` |
12 | |
13 | -libx264gtk.a: muxers.o libx264.a |
14 | +libx264gtk.a: muxers.o |
15 | $(MAKE) -C gtk |
16 | |
17 | checkasm: tools/checkasm.o libx264.a |
18 | @@ -139,16 +139,9 @@ |
19 | rm -f config.mak config.h x264.pc |
20 | $(MAKE) -C gtk distclean |
21 | |
22 | -install: x264 $(SONAME) |
23 | - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) |
24 | - install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig |
25 | - install -m 644 x264.h $(DESTDIR)$(includedir) |
26 | - install -m 644 libx264.a $(DESTDIR)$(libdir) |
27 | - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig |
28 | +install: x264 |
29 | + install -d $(DESTDIR)$(bindir) |
30 | install x264 $(DESTDIR)$(bindir) |
31 | - ranlib $(DESTDIR)$(libdir)/libx264.a |
32 | - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) |
33 | - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) |
34 | |
35 | install-gtk: libx264gtk.a |
36 | $(MAKE) -C gtk install |
37 | diff -Naur x264-snapshot-20070106-2245/configure x264-snapshot-20070106-2245-magellan/configure |
38 | --- x264-snapshot-20070106-2245/configure 2007-01-06 22:45:02.000000000 +0100 |
39 | +++ x264-snapshot-20070106-2245-magellan/configure 2007-11-14 15:21:47.000000000 +0100 |
40 | @@ -407,7 +407,6 @@ |
41 | if [ "$shared" = "yes" ]; then |
42 | API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') |
43 | echo "SONAME=libx264.so.$API" >> config.mak |
44 | - echo 'default: $(SONAME)' >> config.mak |
45 | if [ "$gtk" = "yes" ]; then |
46 | echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak |
47 | fi |
48 | diff -Naur x264-snapshot-20070106-2245/gtk/Makefile x264-snapshot-20070106-2245-magellan/gtk/Makefile |
49 | --- x264-snapshot-20070106-2245/gtk/Makefile 2007-01-06 22:45:01.000000000 +0100 |
50 | +++ x264-snapshot-20070106-2245-magellan/gtk/Makefile 2007-11-14 15:22:40.000000000 +0100 |
51 | @@ -46,14 +46,14 @@ |
52 | |
53 | X264GTK_PC = x264gtk.pc |
54 | |
55 | -EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a |
56 | +EXTERNAL_DEPS= ../muxers.o ../matroska.o |
57 | |
58 | |
59 | all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC) |
60 | |
61 | # Already provides iconv/intl |
62 | CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\" |
63 | -LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a |
64 | +LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264` |
65 | |
66 | |
67 | # gettext rules |