head 1.2; access; symbols pkgsrc-2017Q4:1.1.0.8 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.6 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.2 pkgsrc-2017Q2-base:1.1; locks; strict; comment @# @; 1.2 date 2018.02.25.21.57.43; author adam; state dead; branches; next 1.1; commitid 2ps9r5ScYtNmYhsA; 1.1 date 2017.06.16.05.39.23; author adam; state Exp; branches; next ; commitid 14NOjI67OFshIyVz; desc @@ 1.2 log @x264-devel: updated to 20180224 20180224: Remove ARRAY_SIZE macro which is identical to ARRAY_ELEMS x86inc: Correctly set mmreg variables .gitignore: Ignore TAGS file Minor configure improvements Bump dates to 2018 Merge zero buffers rdo: Use ALIGNED_ARRAY for stack arrays Correctly align buffers for AVX and AVX-512 Cosmetics ppc: Add load_deinterleave_chroma_fenc_altivec Update to the latest upstream version of gas-preprocessor input: Add a workaround for swscale overread bugs filters/resize: Upgrade to a newer libavutil API aarch64: Use ldurb/sturb for loads/stores with negative offsets configure: Add support for building with MSVC/armasm for ARM64 arm: Check for __ELF__ instead of !__APPLE__, for using .arch/.fpu @ text @$NetBSD: patch-Makefile,v 1.1 2017/06/16 05:39:23 adam Exp $ Add rule for .lo:.S needed by aarch64 --- Makefile.orig 2017-06-15 20:45:03.000000000 +0000 +++ Makefile @@@@ -34,7 +34,7 @@@@ OBJS = OBJSO = OBJCLI = -OBJCHK = tools/checkasm.o +OBJCHK = tools/checkasm.lo OBJEXAMPLE = example.o @@@@ -99,9 +99,9 @@@@ endif ifdef ARCH_X86 SRCS += common/x86/mc-c.c common/x86/predict-c.c -OBJASM = $(ASMSRC:%.asm=%.o) +OBJASM = $(ASMSRC:%.asm=%.lo) $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm -OBJCHK += tools/checkasm-a.o +OBJCHK += tools/checkasm-a.lo endif endif @@@@ -121,8 +121,8 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ common/arm/predict-a.S common/arm/bitstream-a.S SRCS += common/arm/mc-c.c common/arm/predict-c.c -OBJASM = $(ASMSRC:%.S=%.o) -OBJCHK += tools/checkasm-arm.o +OBJASM = $(ASMSRC:%.S=%.lo) +OBJCHK += tools/checkasm-arm.lo endif endif @@@@ -140,8 +140,8 @@@@ ASMSRC += common/aarch64/bitstream-a.S \ SRCS += common/aarch64/asm-offsets.c \ common/aarch64/mc-c.c \ common/aarch64/predict-c.c -OBJASM = $(ASMSRC:%.S=%.o) -OBJCHK += tools/checkasm-aarch64.o +OBJASM = $(ASMSRC:%.S=%.lo) +OBJCHK += tools/checkasm-aarch64.lo endif endif @@@@ -173,20 +173,23 @@@@ GENERATED += common/oclobj.h SRCS += common/opencl.c encoder/slicetype-cl.c endif -OBJS += $(SRCS:%.c=%.o) -OBJCLI += $(SRCCLI:%.c=%.o) +OBJS += $(SRCS:%.c=%.lo) +OBJCLI += $(SRCCLI:%.c=%.lo) OBJSO += $(SRCSO:%.c=%.o) .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags +%.lo: %.c + ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAG} -o $@@ $< + cli: x264$(EXE) -lib-static: $(LIBX264) +lib-static: libx264.la lib-shared: $(SONAME) -$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM) - rm -f $(LIBX264) - $(AR)$@@ $(OBJS) $(OBJASM) - $(if $(RANLIB), $(RANLIB) $@@) +libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM) + ${LIBTOOL} --mode=link \ + ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \ + $(OBJS) $(OBJASM) ${LDFLAGS} $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO) $(LD)$@@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) @@@@ -198,24 +201,22 @@@@ checkasm: checkasm$(EXE) example: example$(EXE) endif -x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264) - $(LD)$@@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS) +x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la + ${LIBTOOL} --mode=link $(LD)$@@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS) -checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264) - $(LD)$@@ $(OBJCHK) $(LIBX264) $(LDFLAGS) +checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la + ${LIBTOOL} --mode=link $(LD)$@@ $+ $(LDFLAGS) example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264) $(LD)$@@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS) $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend -%.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 $@@ $< %.dll.o: %.rc x264.h $(RC) $(RCFLAGS)$@@ -DDLL $< @@@@ -282,8 +283,7 @@@@ distclean: clean rm -rf conftest* install-cli: cli - $(INSTALL) -d $(DESTDIR)$(bindir) - $(INSTALL) x264$(EXE) $(DESTDIR)$(bindir) + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264 install-lib-dev: $(INSTALL) -d $(DESTDIR)$(includedir) @@@@ -294,8 +294,7 @@@@ install-lib-dev: $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig install-lib-static: lib-static install-lib-dev - $(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir) - $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264)) + ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir) install-lib-shared: lib-shared install-lib-dev ifneq ($(IMPLIBNAME),) @ 1.1 log @Changes 20170615: * x86: Avoid self-relative expressions on macho64 * configure: Don't try to detect clang by $CC * checkasm: Use the right variable in a loop condition * x86: Fix linking with 8-bit depth shared libx264 * x86: Only enable AVX-512 in 8-bit mode * x86: AVX-512 cabac_block_residual * x86: AVX-512 pixel_sad_x3 and pixel_sad_x4 * x86: AVX-512 pixel_sad * x86: AVX-512 decimate_score * x86: AVX-512 pixel_var2_8x8 and 8x16 * Rework pixel_var2 * x86: AVX-512 pixel_var_8x8, 8x16, and 16x16 * x86: AVX-512 pixel_sa8d_8x8 * x86: AVX-512 pixel_satd * x86: AVX-512 deblock_strength * x86: AVX-512 plane_copy_deinterleave_v210 * x86: AVX-512 memzero_aligned * x86: AVX and AVX-512 memcpy_aligned * x86: AVX-512 dequant_8x8_flat16 * x86: AVX-512 dequant_8x8 * x86: AVX-512 dequant_4x4 * x86: AVX-512 mbtree_propagate_cost * x86: AVX-512 coeff_last * x86: AVX-512 zigzag_interleave_8x8_cavlc * x86: AVX-512 zigzag_scan_8x8_field * x86: AVX-512 zigzag_scan_4x4_field * x86: AVX-512 zigzag_scan_8x8_frame * x86: AVX-512 zigzag_scan_4x4_frame * checkasm: x86: More accurate ymm/zmm measurements * x86: AVX-512 support * x86: Change assembler from yasm to nasm * x86: Add some additional cpuflag relations * x86: Faster SSE2 pixel_sad_16x16 and 16x8 * msvs/icl: Improve target host detection * ppc: Optimize add8x8_idct_dc @ text @d1 1 a1 1 $NetBSD$ @