head 1.25; access; symbols pkgsrc-2017Q1:1.24.0.6 pkgsrc-2017Q1-base:1.24 pkgsrc-2016Q4:1.24.0.4 pkgsrc-2016Q4-base:1.24 pkgsrc-2016Q3:1.24.0.2 pkgsrc-2016Q3-base:1.24 pkgsrc-2016Q2:1.23.0.4 pkgsrc-2016Q2-base:1.23 pkgsrc-2016Q1:1.23.0.2 pkgsrc-2016Q1-base:1.23 pkgsrc-2015Q4:1.22.0.4 pkgsrc-2015Q4-base:1.22 pkgsrc-2015Q3:1.22.0.2 pkgsrc-2015Q3-base:1.22 pkgsrc-2015Q2:1.21.0.4 pkgsrc-2015Q2-base:1.21 pkgsrc-2015Q1:1.21.0.2 pkgsrc-2015Q1-base:1.21 pkgsrc-2014Q4:1.20.0.4 pkgsrc-2014Q4-base:1.20 pkgsrc-2014Q3:1.20.0.2 pkgsrc-2014Q3-base:1.20 pkgsrc-2014Q2:1.19.0.4 pkgsrc-2014Q2-base:1.19 pkgsrc-2014Q1:1.19.0.2 pkgsrc-2014Q1-base:1.19 pkgsrc-2013Q4:1.18.0.4 pkgsrc-2013Q4-base:1.18 pkgsrc-2013Q3:1.18.0.2 pkgsrc-2013Q3-base:1.18 pkgsrc-2013Q2:1.17.0.6 pkgsrc-2013Q2-base:1.17 pkgsrc-2013Q1:1.17.0.4 pkgsrc-2013Q1-base:1.17 pkgsrc-2012Q4:1.17.0.2 pkgsrc-2012Q4-base:1.17 pkgsrc-2012Q3:1.15.0.6 pkgsrc-2012Q3-base:1.15 pkgsrc-2012Q2:1.15.0.4 pkgsrc-2012Q2-base:1.15 pkgsrc-2012Q1:1.15.0.2 pkgsrc-2012Q1-base:1.15 pkgsrc-2011Q4:1.14.0.4 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q3:1.14.0.2 pkgsrc-2011Q3-base:1.14 pkgsrc-2011Q2:1.13.0.4 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.2 pkgsrc-2011Q1-base:1.13 pkgsrc-2010Q4:1.12.0.6 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.4 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.2 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.11.0.8 pkgsrc-2010Q1-base:1.11 pkgsrc-2009Q4:1.11.0.6 pkgsrc-2009Q4-base:1.11 pkgsrc-2009Q3:1.11.0.4 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.2 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.10.0.2 pkgsrc-2009Q1-base:1.10 pkgsrc-2008Q4:1.9.0.2 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.8.0.8 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.6 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.4 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.2 pkgsrc-2008Q1:1.6.0.2 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.1.0.16 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.14 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.12 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.10 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.8 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.6 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.4 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.2 pkgsrc-2006Q1-base:1.1; locks; strict; comment @# @; 1.25 date 2017.06.16.05.39.23; author adam; state dead; branches; next 1.24; commitid 14NOjI67OFshIyVz; 1.24 date 2016.08.28.06.42.27; author richard; state Exp; branches; next 1.23; commitid 0QWK7BHFFg3Hs2kz; 1.23 date 2015.12.28.11.37.03; author adam; state Exp; branches; next 1.22; commitid 0toXJ6kB6X39WHOy; 1.22 date 2015.07.18.11.08.22; author adam; state Exp; branches; next 1.21; commitid goV4iyKKSEaS0Lty; 1.21 date 2015.01.20.09.37.53; author wiz; state Exp; branches; next 1.20; commitid Wk1fZQgHv9sWgK6y; 1.20 date 2014.08.10.15.39.15; author adam; state Exp; branches; next 1.19; commitid fB3GByIIxgPOvPLx; 1.19 date 2014.03.04.13.59.11; author adam; state Exp; branches; next 1.18; commitid RdfuaAEcTd4l4orx; 1.18 date 2013.07.04.16.43.55; author wiz; state Exp; branches; next 1.17; commitid rMxakXNZDsE9NaWw; 1.17 date 2012.11.08.20.28.09; author adam; state Exp; branches; next 1.16; 1.16 date 2012.11.08.19.55.56; author adam; state Exp; branches; next 1.15; 1.15 date 2012.01.09.17.04.03; author drochner; state Exp; branches; next 1.14; 1.14 date 2011.07.18.21.00.11; author drochner; state Exp; branches; next 1.13; 1.13 date 2011.01.17.16.46.42; author drochner; state Exp; branches; next 1.12; 1.12 date 2010.05.04.18.18.57; author drochner; state Exp; branches; next 1.11; 1.11 date 2009.05.25.20.56.38; author drochner; state Exp; branches; next 1.10; 1.10 date 2009.02.03.08.44.15; author obache; state Exp; branches; next 1.9; 1.9 date 2008.12.18.16.19.07; author bjs; state Exp; branches; next 1.8; 1.8 date 2008.07.10.13.40.40; author joerg; state Exp; branches; next 1.7; 1.7 date 2008.04.09.18.33.37; author tron; state Exp; branches; next 1.6; 1.6 date 2008.03.31.16.16.00; author tron; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2008.03.18.15.05.04; author tron; state Exp; branches; next 1.4; 1.4 date 2008.03.11.13.20.29; author tron; state Exp; branches; next 1.3; 1.3 date 2008.03.10.11.59.26; author drochner; state Exp; branches; next 1.2; 1.2 date 2008.01.04.18.41.55; author joerg; state dead; branches; next 1.1; 1.1 date 2006.02.23.18.11.27; author joerg; state Exp; branches; next ; 1.6.2.1 date 2008.04.20.04.08.03; author rtr; state Exp; branches; next ; desc @@ 1.25 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 @$NetBSD: patch-ab,v 1.24 2016/08/28 06:42:27 richard Exp $ 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 = 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 $< @@@@ -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 - $(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) @@@@ -293,8 +293,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.24 log @add rule for libtool native 'gas' build when yasm isn't used (on aarch64) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.23 2015/12/28 11:37:03 adam Exp $ @ 1.23 log @Changes 20151227: * ppc: Add detection of AltiVec support for FreeBSD * Don't assume 16-byte stack alignment by default on x86-32 * Fix a few static analyzer performance hints * Revise the row VBV algorithm * Fix high bit depth lookahead cost compensation algorithm * Correctly update the intra row predictor in B-frames * Change the predictors update algorithm @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 --- Makefile.orig 2015-10-24 20:45:04.000000000 +0000 d81 1 a81 1 @@@@ -198,20 +201,19 @@@@ checkasm: checkasm$(EXE) d103 4 d109 3 d113 3 a115 3 %.o: %.S $(AS) $(ASFLAGS) -o $@@ $< @@@@ -281,8 +283,7 @@@@ distclean: clean d125 1 a125 1 @@@@ -293,8 +294,7 @@@@ install-lib-dev: @ 1.22 log @Changes: * Update configure for auto detection of system libx264 configuration * Add tile format frame packing value * Stricter validation of crop-rect values * Add mono frame packing value * Validate frame packing value instead of clipping * x86inc: Correctly warn on use of SSE2 instructions in SSE functions * x86inc: Fix instantiation of YMM registers * matroska: Correctly write display width and height in stereo mode * Use POC type 0 for AVC-Intra * Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable * Fix negative percentages in final stats output @ text @d3 1 a3 1 --- Makefile.orig 2015-07-17 20:45:05.000000000 +0000 d5 9 d26 1 a26 1 @@@@ -121,7 +121,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d28 1 a28 1 common/arm/predict-a.S d31 12 d44 1 d48 1 a48 1 @@@@ -162,20 +162,23 @@@@ GENERATED += common/oclobj.h d61 1 a61 1 + ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@@ $< d79 1 a79 1 @@@@ -187,20 +190,19 @@@@ checkasm: checkasm$(EXE) d106 1 a106 1 @@@@ -270,8 +272,7 @@@@ distclean: clean d116 1 a116 1 @@@@ -282,8 +283,7 @@@@ install-lib-dev: @ 1.21 log @Update to 20141218, the latest available snapshot. Does anyone know why there are no newer ones? @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.20 2014/08/10 15:39:15 adam Exp $ d3 1 a3 1 --- Makefile.orig 2014-12-18 21:45:04.000000000 +0000 d26 1 a26 1 @@@@ -159,20 +159,23 @@@@ GENERATED += common/oclobj.h d57 1 a57 1 @@@@ -184,20 +187,19 @@@@ checkasm: checkasm$(EXE) d84 2 a85 2 @@@@ -267,8 +269,7 @@@@ distclean: clean rm -f config.mak x264_config.h config.h config.log x264.pc x264.def d94 1 a94 1 @@@@ -279,8 +280,7 @@@@ install-lib-dev: @ 1.20 log @Changes 20140809: Bug fixes and improvements. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2014-08-09 20:45:04.000000000 +0000 d5 1 a5 1 @@@@ -97,9 +97,9 @@@@ endif d17 1 a17 1 @@@@ -119,7 +119,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 1 @@@@ -142,20 +142,23 @@@@ GENERATED += common/oclobj.h d57 2 a58 2 @@@@ -166,17 +169,16 @@@@ x264: x264$(EXE) checkasm: checkasm$(EXE) d71 4 a74 1 $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK): .depend d84 1 a84 1 @@@@ -245,8 +247,7 @@@@ distclean: clean d94 1 a94 1 @@@@ -257,8 +258,7 @@@@ install-lib-dev: @ 1.19 log @Changes 20140303: Bug fixes. Enabled OpenCL for Darwin. Fix building with Clang. @ text @d3 1 a3 1 --- Makefile.orig 2014-03-03 21:45:04.000000000 +0000 d5 2 a6 1 @@@@ -100,9 +100,9 @@@@ endif a7 1 ASFLAGS += -I$(SRCPATH)/common/x86/ d17 1 a17 1 @@@@ -122,7 +122,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 10 @@@@ -130,7 +130,7 @@@@ endif ifeq ($(ARCH),UltraSPARC) ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),) ASMSRC += common/sparc/pixel.asm -OBJASM = $(ASMSRC:%.asm=%.o) +OBJASM = $(ASMSRC:%.asm=%.lo) endif endif @@@@ -153,20 +153,23 @@@@ GENERATED += common/oclobj.h d36 1 a36 1 .PHONY: all default fprofiled clean distclean install uninstall lib-static lib-shared cli install-lib-dev install-lib-static install-lib-shared install-cli d57 1 a57 1 @@@@ -177,17 +180,17 @@@@ x264: x264$(EXE) d73 1 a73 1 -%.o: %.asm d76 2 a77 3 +%.lo: %.asm + ${LIBTOOL} --mode=compile --tag=CC \ + ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@@ $< d81 1 a81 1 @@@@ -246,8 +249,7 @@@@ distclean: clean d91 1 a91 1 @@@@ -258,8 +260,7 @@@@ install-lib-dev: @ 1.18 log @Update to 20130703 snapshot: speedups, opencl support (disabled in pkgsrc). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.17 2012/11/08 20:28:09 adam Exp $ d3 1 a3 1 --- Makefile.orig 2013-07-03 20:45:03.000000000 +0000 d5 1 a5 1 @@@@ -101,9 +101,9 @@@@ endif d17 1 a17 1 @@@@ -123,7 +123,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 1 @@@@ -131,7 +131,7 @@@@ endif d35 1 a35 1 @@@@ -154,20 +154,23 @@@@ GENERATED += common/oclobj.h d66 1 a66 1 @@@@ -178,17 +181,17 @@@@ x264: x264$(EXE) d91 1 a91 1 @@@@ -247,8 +250,7 @@@@ distclean: clean d95 2 a96 2 - install -d $(DESTDIR)$(bindir) - install x264$(EXE) $(DESTDIR)$(bindir) d100 3 a102 3 install -d $(DESTDIR)$(includedir) @@@@ -259,8 +261,7 @@@@ install-lib-dev: install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig d105 1 a105 1 - install -m 644 $(LIBX264) $(DESTDIR)$(libdir) @ 1.17 log @Oops... also install x264 binary @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2012-11-07 21:45:03.000000000 +0000 d5 1 a5 1 @@@@ -99,9 +99,9 @@@@ endif d17 1 a17 1 @@@@ -121,7 +121,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 1 @@@@ -129,7 +129,7 @@@@ endif d35 2 a36 2 @@@@ -145,20 +145,23 @@@@ OBJSO += $(if $(RC), x264res.dll.o) endif d55 1 a55 1 -$(LIBX264): .depend $(OBJS) $(OBJASM) d59 1 a59 1 +libx264.la: .depend $(OBJS) $(OBJASM) d64 1 a64 1 $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) d66 1 a66 1 @@@@ -169,17 +172,17 @@@@ x264: x264$(EXE) d70 1 a70 1 -x264$(EXE): .depend $(OBJCLI) $(CLI_LIBX264) d72 1 a72 1 +x264$(EXE): .depend $(OBJCLI) libx264.la d75 1 a75 1 -checkasm$(EXE): .depend $(OBJCHK) $(LIBX264) d77 1 a77 1 +checkasm$(EXE): .depend $(OBJCHK) libx264.la d91 1 a91 1 @@@@ -238,8 +241,7 @@@@ distclean: clean d101 1 a101 1 @@@@ -250,8 +252,7 @@@@ install-lib-dev: @ 1.16 log @Changes 20121107: This is another snapshot. @ text @d91 11 a101 1 @@@@ -250,8 +253,7 @@@@ install-lib-dev: @ 1.15 log @update to the 20111207 snapshot (this date is the beginning of a period of stability in the development tree) changelog is unknown @ text @d3 1 a3 1 --- Makefile.orig 2011-12-07 21:45:03.000000000 +0000 d5 1 a5 1 @@@@ -88,9 +88,9 @@@@ endif d7 1 a7 1 ASFLAGS += -Icommon/x86/ d17 1 a17 1 @@@@ -110,7 +110,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 1 @@@@ -118,7 +118,7 @@@@ endif d35 1 a35 1 @@@@ -132,8 +132,8 @@@@ SRCSO += x264dll.c d39 5 a43 6 -OBJS = $(SRCS:%.c=%.o) -OBJCLI = $(SRCCLI:%.c=%.o) +OBJS = $(SRCS:%.c=%.lo) +OBJCLI = $(SRCCLI:%.c=%.lo) OBJSO = $(SRCSO:%.c=%.o) DEP = depend d45 1 a45 3 @@@@ -141,14 +141,17 @@@@ DEP = depend default: $(DEP) d66 1 a66 1 @@@@ -159,17 +162,17 @@@@ x264: x264$(EXE) d91 1 a91 1 @@@@ -234,8 +237,7 @@@@ install-lib-dev: @ 1.14 log @update to 20110707 a newer snapshot is needed for newer versions of ffmpeg @ text @d3 1 a3 1 --- Makefile.orig 2011-07-07 20:45:05.000000000 +0000 d5 1 a5 1 @@@@ -86,9 +86,9 @@@@ endif d12 2 a13 2 -checkasm: tools/checkasm-a.o +checkasm: tools/checkasm-a.lo d17 1 a17 1 @@@@ -108,7 +108,7 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 1 a26 1 @@@@ -116,7 +116,7 @@@@ endif d35 1 a35 1 @@@@ -130,8 +130,8 @@@@ SRCSO += x264dll.c d46 1 a46 1 @@@@ -139,26 +139,30 @@@@ DEP = depend d59 1 d69 3 d78 3 a80 3 -checkasm: tools/checkasm.o $(LIBX264) - $(LD)$@@ $+ $(LDFLAGS) +checkasm: tools/checkasm.o libx264.la d83 2 d94 1 a94 1 @@@@ -224,8 +228,7 @@@@ install-lib-dev: d103 1 a103 1 ifeq ($(SYS),WINDOWS) @ 1.13 log @update to 20110101, from Makoto Fujiwara per pkgsrc-wip (I've just put back libtool support.) needed for update of ffmpeg which in turn is needed for updates of eg vlc and gst-plugin-ffmpeg @ text @d3 1 a3 1 --- Makefile.orig 2011-01-01 21:45:05.000000000 +0000 d46 1 a46 1 @@@@ -139,22 +139,26 @@@@ DEP = depend d48 1 a48 1 default: $(DEP) x264$(EXE) a49 3 -libx264.a: .depend $(OBJS) $(OBJASM) - $(AR) rc libx264.a $(OBJS) $(OBJASM) - $(RANLIB) libx264.a d53 8 d67 1 a67 1 $(CC) -shared -o $@@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) d69 9 a77 9 -x264$(EXE): $(OBJCLI) libx264.a - $(CC) -o $@@ $+ $(LDFLAGSCLI) $(LDFLAGS) +x264$(EXE): $(OBJCLI) libx264.la + ${LIBTOOL} --mode=link $(CC) -o $@@ $+ $(LDFLAGSCLI) $(LDFLAGS) -checkasm: tools/checkasm.o libx264.a - $(CC) -o $@@ $+ $(LDFLAGS) +checkasm: tools/checkasm.lo libx264.la + ${LIBTOOL} --mode=link $(CC) -o $@@ $+ $(LDFLAGS) d81 1 a81 1 - -@@ $(STRIP) -x $@@ # delete local/anonymous symbols, so they don't show up in oprofile d88 6 a93 15 @@@@ -212,24 +216,17 @@@@ distclean: clean rm -f config.mak x264_config.h config.h config.log x264.pc rm -rf test/ -install: x264$(EXE) $(SONAME) - install -d $(DESTDIR)$(bindir) - install -d $(DESTDIR)$(includedir) - install -d $(DESTDIR)$(libdir) - install -d $(DESTDIR)$(libdir)/pkgconfig +install: x264$(EXE) libx264.la + install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) + install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) install -m 644 x264_config.h $(DESTDIR)$(includedir) - install -m 644 libx264.a $(DESTDIR)$(libdir) a94 11 install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig - install x264$(EXE) $(DESTDIR)$(bindir) - $(RANLIB) $(DESTDIR)$(libdir)/libx264.a + ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264$(EXE) $(DESTDIR)$(bindir) ifeq ($(SYS),MINGW) $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) -else - $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) endif - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) d96 2 a97 2 uninstall: rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(includedir)/x264_config.h $(DESTDIR)$(libdir)/libx264.a @ 1.12 log @update to the 20090920 snapshot The snapshot date is chosen for some reason: -vlc-1.0.6 (which I'll commit soon) needs an API change which was introduced on 20090813 -pkgsrc's ffmpeg can't deal with an API change which was done 20090921 (and is not easily updated) @ text @d3 1 a3 1 --- Makefile.orig 2009-09-20 20:45:09.000000000 +0000 d5 1 a5 1 @@@@ -40,9 +40,9 @@@@ endif d17 1 a17 10 @@@@ -52,7 +52,7 @@@@ ALTIVECSRC += common/ppc/mc.c common/ppc common/ppc/quant.c common/ppc/deblock.c \ common/ppc/predict.c SRCS += $(ALTIVECSRC) -$(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS) +$(ALTIVECSRC:%.c=%.lo): CFLAGS += $(ALTIVECFLAGS) endif # NEON optims @@@@ -62,44 +62,49 @@@@ ASMSRC += common/arm/cpu-a.S common/arm/ d26 3 a28 2 # VIS optims ifeq ($(ARCH),UltraSparc) d33 1 d35 2 a36 2 ifneq ($(HAVE_GETOPT_LONG),1) SRCS += extras/getopt.c d43 1 d46 1 a46 1 .PHONY: all default fprofiled clean distclean install uninstall dox test testclean d61 2 a62 2 $(SONAME): .depend $(OBJS) $(OBJASM) $(CC) -shared -o $@@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) d64 4 a67 4 -x264$(EXE): $(OBJCLI) libx264.a - $(CC) -o $@@ $+ $(LDFLAGS) +x264$(EXE): $(OBJCLI) libx264.la + ${LIBTOOL} --mode=link $(CC) -o $@@ $+ $(LDFLAGS) a79 1 + -@@ $(STRIP) -x $(@@:.lo=.o) # delete local/anonymous symbols, so they don't show up in oprofile d83 2 a84 2 @@@@ -156,21 +161,16 @@@@ distclean: clean rm -f config.mak config.h x264.pc d88 4 d93 2 a94 2 install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig d96 1 d106 1 a106 1 - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) d112 1 a112 1 rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a @ 1.11 log @update to the 20090326 snapshot. This is not absolutely new, but there was a period of relative quietness in x264 development, and I've been testing this snapshot for some weeks (on i386). There are too many changes to list here. @ text @d3 1 a3 1 --- Makefile.orig 2009-03-26 22:45:08.000000000 +0100 d17 1 a17 1 @@@@ -52,44 +52,49 @@@@ ALTIVECSRC += common/ppc/mc.c common/ppc d25 10 d72 1 a72 1 +x264$(EXE): $(OBJCLI) libx264.la d82 1 d86 5 a90 7 # delete local/anonymous symbols, so they don't show up in oprofile - -@@ $(STRIP) -x $@@ + -@@ $(STRIP) -x $(@@:.lo=.o) .depend: config.mak rm -f .depend @@@@ -143,21 +148,16 @@@@ distclean: clean @ 1.10 log @Let to link libx264.la with ${LDFLAGS}, not only ${PTHREAD_LDFLAGS} and ${PTHREAD_LIBS}, same as original .so target. At least, need to link with -lm (using pow(3)) Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 2008/12/18 16:19:07 bjs Exp $ d3 1 a3 1 --- Makefile.orig 2008-12-17 21:45:13.000000000 +0000 d47 2 a48 2 - ar rc libx264.a $(OBJS) $(OBJASM) - ranlib libx264.a d62 1 a62 1 +x264$(EXE): $(OBJCLI) libx264.la d76 2 a77 2 - -@@ strip -x $@@ + -@@ strip -x $(@@:.lo=.o) d81 1 a81 1 @@@@ -144,21 +149,16 @@@@ distclean: clean d94 1 a94 1 - ranlib $(DESTDIR)$(libdir)/libx264.a @ 1.9 log @Update to 20081218 snapshot. There is no NEWS file or list of changes; please see the repository for more information. I'm doing this update our version is over a year old and some software is starting to require a newer version. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.8 2008/07/10 13:40:40 joerg Exp $ d3 1 a3 1 --- Makefile.orig 2008-12-12 16:45:07.000000000 -0500 d55 1 a55 1 + $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} @ 1.8 log @Fix build on Solaris: install -d must be called with only one directory. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- Makefile.orig 2008-07-10 15:34:13.000000000 +0200 d5 4 a8 4 @@@@ -26,7 +26,7 @@@@ ASMSRC = common/i386/dct-a.asm common/i common/i386/mc-a2.asm common/i386/predict-a.asm \ common/i386/pixel-sse2.asm common/i386/quant-a.asm \ common/i386/deblock-a.asm d11 3 a13 1 ASFLAGS += -Icommon/i386/ d16 2 a17 10 @@@@ -40,7 +40,7 @@@@ ASMSRC = common/amd64/dct-a.asm common/ common/amd64/mc-a2.asm common/amd64/predict-a.asm \ common/amd64/pixel-sse2.asm common/amd64/quant-a.asm \ common/amd64/deblock-a.asm -OBJASM = $(ASMSRC:%.asm=%.o) +OBJASM = $(ASMSRC:%.asm=%.lo) ASFLAGS += -Icommon/amd64 endif endif @@@@ -51,20 +51,20 @@@@ ALTIVECSRC += common/ppc/mc.c common/ppc d37 1 d39 1 a39 1 OBJCLI = $(SRCCLI:%.c=%.o) d42 1 a42 1 @@@@ -73,15 +73,17 @@@@ all: default d50 1 a50 1 + ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} -o $@@ $< d53 3 a55 1 + ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0 d58 1 a58 1 $(CC) -shared -o $@@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS) d65 4 a68 5 libx264gtk.a: muxers.o libx264.a $(MAKE) -C gtk @@@@ -89,10 +91,10 @@@@ libx264gtk.a: muxers.o libx264.a checkasm: tools/checkasm.o libx264.a $(CC) -o $@@ $+ $(LDFLAGS) a69 2 -common/amd64/*.o: common/amd64/amd64inc.asm -common/i386/*.o: common/i386/i386inc.asm a71 2 +common/amd64/*.lo: common/amd64/amd64inc.asm +common/i386/*.lo: common/i386/i386inc.asm d73 2 a74 1 + ${LIBTOOL} --mode=compile --tag=ASM ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@@ $< d76 2 a77 1 -@@ strip -x $@@ d79 10 a88 10 @@@@ -150,15 +152,14 @@@@ distclean: clean $(MAKE) -C gtk distclean install: x264 $(SONAME) - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) - install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig + install -d $(DESTDIR)$(bindir) + install -d $(DESTDIR)$(includedir) + install -d $(DESTDIR)$(libdir) + install -d $(DESTDIR)$(libdir)/pkgconfig d91 1 a91 1 + ${LIBTOOL} --mode=install install -m 644 libx264.la $(DESTDIR)$(libdir) d93 1 a93 1 - install x264 $(DESTDIR)$(bindir) d95 5 a99 1 - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) d101 2 a102 1 + ${LIBTOOL} --mode=install install x264 $(DESTDIR)$(bindir) d104 2 a105 2 install-gtk: libx264gtk.a $(MAKE) -C gtk install @ 1.7 log @Try harder to disable AltiVec support under Mac OS X PPC (because it cannot be used in a shared library). Applications linked against "libx264" can now actually be started without crashing immediately because the symbol "_x264_deblock_h_luma_altivec" couldn't be found. Bump package revision because of this fix. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $ d3 3 a5 3 --- Makefile.orig 2007-12-18 21:45:04.000000000 +0000 +++ Makefile 2008-03-31 17:09:28.000000000 +0100 @@@@ -26,7 +26,7 @@@@ d14 1 a14 1 @@@@ -40,31 +40,31 @@@@ d23 1 a23 4 # AltiVec optims ifeq ($(ARCH),PPC) ALTIVECSRC += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ d47 1 a47 1 @@@@ -73,15 +75,17 @@@@ d70 1 a70 1 @@@@ -89,10 +93,10 @@@@ d85 10 a94 3 @@@@ -153,12 +157,9 @@@@ install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig @ 1.6 log @Completely disable PowerPC assembler code under Mac OS X. It requires to ignore linker warnings under Tiger and doesn't work at all under Leopard with Xcode tools 3.0. @ text @d1 1 a1 1 $NetBSD$ d14 1 a14 1 @@@@ -40,31 +40,33 @@@@ a25 1 +ifneq ($(SYS),MACOSX) a31 1 +endif @ 1.6.2.1 log @pullup ticket 2329 - requested by tron@@ fix package build on macosx/ppc machines Revisions pulled up: - pkgsrc/multimedia/x264-devel/Makefile 1.12 - pkgsrc/multimedia/x264-devel/distinfo 1.10 - pkgsrc/multimedia/x264-devel/patches/patch-aa 1.5 - pkgsrc/multimedia/x264-devel/patches/patch-ab 1.7 Module Name: pkgsrc Committed By: tron Date: Wed Apr 9 18:33:37 UTC 2008 Modified Files: pkgsrc/multimedia/x264-devel: Makefile distinfo pkgsrc/multimedia/x264-devel/patches: patch-aa patch-ab Log Message: Try harder to disable AltiVec support under Mac OS X PPC (because it cannot be used in a shared library). Applications linked against "libx264" can now actually be started without crashing immediately because the symbol "_x264_deblock_h_luma_altivec" couldn't be found. Bump package revision because of this fix. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2008/03/31 16:16:00 tron Exp $ d14 1 a14 1 @@@@ -40,31 +40,31 @@@@ d26 1 d33 1 @ 1.5 log @Fix build under Mac OS X Intel by stripping out the "-fno-common" that "yasm" doesn't understand. Also improve the similar hack used under NetBSD to strip out "-fpic". @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2008/03/11 13:20:29 tron Exp $ d3 3 a5 3 --- Makefile.orig 2007-12-18 22:45:04.000000000 +0100 +++ Makefile @@@@ -26,7 +26,7 @@@@ ASMSRC = common/i386/dct-a.asm common/i d14 1 a14 1 @@@@ -40,7 +40,7 @@@@ ASMSRC = common/amd64/dct-a.asm common/ d23 5 a27 1 @@@@ -51,20 +51,20 @@@@ ALTIVECSRC += common/ppc/mc.c common/ppc d33 1 d52 1 a52 1 @@@@ -73,15 +73,17 @@@@ all: default d63 1 a63 1 + ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} ${DARWIN_PPC_LDFLAGS} -rpath ${PREFIX}/lib -version-info 0 d75 1 a75 1 @@@@ -89,10 +91,10 @@@@ libx264gtk.a: muxers.o libx264.a d90 1 a90 1 @@@@ -153,12 +155,9 @@@@ install: x264 $(SONAME) @ 1.4 log @Fix build under Mac OS X PPC. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2008/03/10 11:59:26 drochner Exp $ d81 1 a81 1 + ${LIBTOOL} --mode=compile --tag=ASM sh strip_fPIC.sh $(AS) $(ASFLAGS) -o $@@ $< @ 1.3 log @now that that we rely on the fact that we get correct PIC from yasm we can as well use libtool, to get a proper .so which can be dynamically loaded, tested by Mihai Chelaru, bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ d58 1 a58 1 + ${LIBTOOL} --mode=link ${CC} -o libx264.la $(OBJS) $(OBJASM) ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -rpath ${PREFIX}/lib -version-info 0 @ 1.2 log @Update to x264-20071218. No changelog, patch is from Adam Hoka. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2006/02/23 18:11:27 joerg Exp $ d3 97 a99 11 --- encoder/ratecontrol.c.orig 2006-02-23 18:05:04.000000000 +0000 +++ encoder/ratecontrol.c @@@@ -35,7 +35,7 @@@@ #include "common/cpu.h" #include "ratecontrol.h" -#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) +#if defined(SYS_FREEBSD) || defined(SYS_BEOS) || defined(SYS_NETBSD) || defined(SYS_DRAGONFLY) #define exp2f(x) powf( 2, (x) ) #endif #if defined(_MSC_VER) || defined(SYS_SunOS) @ 1.1 log @Add DragonFly support. @ text @d1 1 a1 1 $NetBSD$ @