| 1 |
aballier 09/05/03 20:09:16 |
| 2 |
|
| 3 |
Added: x264-encoder-nolib-20090408.patch |
| 4 |
Log: |
| 5 |
bump a new snapshot |
| 6 |
(Portage version: 2.2_rc32/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/x264-encoder/files/x264-encoder-nolib-20090408.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: x264-encoder-nolib-20090408.patch |
| 15 |
=================================================================== |
| 16 |
Index: x264-snapshot-20090408-2245/Makefile |
| 17 |
=================================================================== |
| 18 |
--- x264-snapshot-20090408-2245.orig/Makefile |
| 19 |
+++ x264-snapshot-20090408-2245/Makefile |
| 20 |
@@ -80,8 +80,8 @@ libx264.a: .depend $(OBJS) $(OBJASM) |
| 21 |
$(SONAME): .depend $(OBJS) $(OBJASM) |
| 22 |
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) |
| 23 |
|
| 24 |
-x264$(EXE): $(OBJCLI) libx264.a |
| 25 |
- $(CC) -o $@ $+ $(LDFLAGS) |
| 26 |
+x264$(EXE): $(OBJCLI) |
| 27 |
+ $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264` |
| 28 |
|
| 29 |
checkasm: tools/checkasm.o libx264.a |
| 30 |
$(CC) -o $@ $+ $(LDFLAGS) |
| 31 |
@@ -143,21 +143,9 @@ distclean: clean |
| 32 |
rm -f config.mak config.h x264.pc |
| 33 |
rm -rf test/ |
| 34 |
|
| 35 |
-install: x264$(EXE) $(SONAME) |
| 36 |
+install: x264$(EXE) |
| 37 |
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) |
| 38 |
- install -d $(DESTDIR)$(libdir) $(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 -sf $(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 |
| 54 |
Index: x264-snapshot-20090408-2245/configure |
| 55 |
=================================================================== |
| 56 |
--- x264-snapshot-20090408-2245.orig/configure |
| 57 |
+++ x264-snapshot-20090408-2245/configure |
| 58 |
@@ -458,7 +458,6 @@ if [ "$shared" = "yes" ]; then |
| 59 |
echo "SONAME=libx264.so.$API" >> config.mak |
| 60 |
echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak |
| 61 |
fi |
| 62 |
- echo 'default: $(SONAME)' >> config.mak |
| 63 |
fi |
| 64 |
|
| 65 |
./version.sh |
Archives