diff options
| author | richard <richard@pkgsrc.org> | 2016-08-28 06:42:27 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-08-28 06:42:27 +0000 |
| commit | a5c73a20db5d3d69381ba266de63224ac7b3bd17 (patch) | |
| tree | 9853bd213fe9e77f667075bdcdd3549cdf627315 /multimedia/x264-devel | |
| parent | 226392c5c01b2a149fe2d38cc46ad80a4138c04b (diff) | |
| download | pkgsrc-a5c73a20db5d3d69381ba266de63224ac7b3bd17.tar.gz | |
add rule for libtool native 'gas' build when yasm isn't used (on aarch64)
Diffstat (limited to 'multimedia/x264-devel')
| -rw-r--r-- | multimedia/x264-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/x264-devel/patches/patch-ab | 23 |
2 files changed, 18 insertions, 9 deletions
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 51c3c0dd3ef..7c734743795 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.41 2016/03/08 15:41:32 wiz Exp $ +$NetBSD: distinfo,v 1.42 2016/08/28 06:42:27 richard Exp $ SHA1 (x264-snapshot-20160307-2245.tar.bz2) = 495868fbd6e99de94ee7c6823853b3fa9b3bfb7e RMD160 (x264-snapshot-20160307-2245.tar.bz2) = 84a911b0b9925f9663ddcc27589f42c5b464f122 SHA512 (x264-snapshot-20160307-2245.tar.bz2) = f080241aad9d83388e061bb23f177944cb0d0645b7385756a85d1fbcee77242b762de7c113b6ad7d43d565ef8100ff6ceaa1f1ed20c0ecdecfe44712a2512b08 Size (x264-snapshot-20160307-2245.tar.bz2) = 727234 bytes SHA1 (patch-aa) = c947b8d057d653169cf62c7983e0f36780d466b4 -SHA1 (patch-ab) = ddc71a4ee27693d5e80527efb26326c4ed9546bd +SHA1 (patch-ab) = f4be6477f75b3f7a411729997712bcaf028f88b2 SHA1 (patch-ba) = b16486f28ba5c34449e015906957062186e657af diff --git a/multimedia/x264-devel/patches/patch-ab b/multimedia/x264-devel/patches/patch-ab index 92e6b619322..180c9e84edb 100644 --- a/multimedia/x264-devel/patches/patch-ab +++ b/multimedia/x264-devel/patches/patch-ab @@ -1,6 +1,8 @@ -$NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $ +$NetBSD: patch-ab,v 1.24 2016/08/28 06:42:27 richard Exp $ ---- Makefile.orig 2015-10-24 20:45:04.000000000 +0000 +add rule for .lo:.S needed by aarch64 + +--- Makefile.orig 2016-03-07 21:45:04.000000000 +0000 +++ Makefile @@ -34,7 +34,7 @@ OBJS = OBJSO = @@ -76,7 +78,7 @@ $NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $ $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) -@@ -198,20 +201,19 @@ checkasm: checkasm$(EXE) +@@ -198,24 +201,22 @@ checkasm: checkasm$(EXE) example: example$(EXE) endif @@ -98,12 +100,19 @@ $NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $ -%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm - $(AS) $(ASFLAGS) -o $@ $< - -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile +- +-%.o: %.S +- $(AS) $(ASFLAGS) -o $@ $< +- -@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile +%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm + ${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $< ++ ++%.lo: %.S ++ ${LIBTOOL} --mode=compile --tag=CC $(AS) $(ASFLAGS) -o $@ $< - %.o: %.S - $(AS) $(ASFLAGS) -o $@ $< -@@ -281,8 +283,7 @@ distclean: clean + %.dll.o: %.rc x264.h + $(RC) $(RCFLAGS)$@ -DDLL $< +@@ -281,8 +282,7 @@ distclean: clean rm -f config.mak x264_config.h config.h config.log x264.pc x264.def conftest* install-cli: cli @@ -113,7 +122,7 @@ $NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $ install-lib-dev: $(INSTALL) -d $(DESTDIR)$(includedir) -@@ -293,8 +294,7 @@ install-lib-dev: +@@ -293,8 +293,7 @@ install-lib-dev: $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install-lib-static: lib-static install-lib-dev |