CVS commit: pkgsrc/multimedia/x264-devel

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Sun Aug 28 06:42:27 UTC 2016

Modified Files:
        pkgsrc/multimedia/x264-devel: distinfo
        pkgsrc/multimedia/x264-devel/patches: patch-ab

Log Message:
add rule for libtool native 'gas' build when yasm isn't used (on aarch64)


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/x264-devel/distinfo
cvs rdiff -u -r1.23 -r1.24 pkgsrc/multimedia/x264-devel/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x264-devel/distinfo
diff -u pkgsrc/multimedia/x264-devel/distinfo:1.41 pkgsrc/multimedia/x264-devel/distinfo:1.42
--- pkgsrc/multimedia/x264-devel/distinfo:1.41  Tue Mar  8 15:41:32 2016
+++ pkgsrc/multimedia/x264-devel/distinfo       Sun Aug 28 06:42:27 2016
@@ -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

Index: pkgsrc/multimedia/x264-devel/patches/patch-ab
diff -u pkgsrc/multimedia/x264-devel/patches/patch-ab:1.23 pkgsrc/multimedia/x264-devel/patches/patch-ab:1.24
--- pkgsrc/multimedia/x264-devel/patches/patch-ab:1.23  Mon Dec 28 11:37:03 2015
+++ pkgsrc/multimedia/x264-devel/patches/patch-ab       Sun Aug 28 06:42:27 2016
@@ -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:3
  
  $(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:3
 -%.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:3
  
  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