kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/multimedia/x264-devel/patches/patch-ab

115 lines
3.6 KiB
Text
Raw Normal View History

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)
2010-05-04 20:18:57 +02:00
$NetBSD: patch-ab,v 1.12 2010/05/04 18:18:57 drochner Exp $
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
2008-03-10 12:59:26 +01:00
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)
2010-05-04 20:18:57 +02:00
--- Makefile.orig 2009-09-20 20:45:09.000000000 +0000
Fix build on Solaris: install -d must be called with only one directory.
2008-07-10 15:40:40 +02:00
+++ Makefile
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.
2008-12-18 17:19:07 +01:00
@@ -40,9 +40,9 @@ endif
ifdef ARCH_X86
ASFLAGS += -Icommon/x86/
SRCS += common/x86/mc-c.c common/x86/predict-c.c
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
2008-03-10 12:59:26 +01:00
-OBJASM = $(ASMSRC:%.asm=%.o)
+OBJASM = $(ASMSRC:%.asm=%.lo)
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.
2008-12-18 17:19:07 +01:00
$(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
-checkasm: tools/checkasm-a.o
+checkasm: tools/checkasm-a.lo
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
2008-03-10 12:59:26 +01:00
endif
endif
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.
2008-12-18 17:19:07 +01:00
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)
2010-05-04 20:18:57 +02:00
@@ -52,7 +52,7 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
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
2008-03-10 12:59:26 +01:00
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
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)
2010-05-04 20:18:57 +02:00
# NEON optims
@@ -62,44 +62,49 @@ 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
SRCS += common/arm/mc-c.c common/arm/predict-c.c
-OBJASM = $(ASMSRC:%.S=%.o)
+OBJASM = $(ASMSRC:%.S=%.lo)
endif
endif
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
2008-03-10 12:59:26 +01:00
# VIS optims
ifeq ($(ARCH),UltraSparc)
ASMSRC += common/sparc/pixel.asm
-OBJASM = $(ASMSRC:%.asm=%.o)
+OBJASM = $(ASMSRC:%.asm=%.lo)
endif
ifneq ($(HAVE_GETOPT_LONG),1)
SRCS += extras/getopt.c
endif
-OBJS = $(SRCS:%.c=%.o)
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.
2008-12-18 17:19:07 +01:00
-OBJCLI = $(SRCCLI:%.c=%.o)
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
2008-03-10 12:59:26 +01:00
+OBJS = $(SRCS:%.c=%.lo)
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.
2008-12-18 17:19:07 +01:00
+OBJCLI = $(SRCCLI:%.c=%.lo)
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
2008-03-10 12:59:26 +01:00
DEP = depend
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.
2008-12-18 17:19:07 +01:00
.PHONY: all default fprofiled clean distclean install uninstall dox test testclean
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
2008-03-10 12:59:26 +01:00
default: $(DEP) x264$(EXE)
-libx264.a: .depend $(OBJS) $(OBJASM)
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.
2009-05-25 22:56:38 +02:00
- $(AR) rc libx264.a $(OBJS) $(OBJASM)
- $(RANLIB) libx264.a
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
2008-03-10 12:59:26 +01:00
+%.lo: %.c
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.
2008-12-18 17:19:07 +01:00
+ ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAGS} -o $@ $<
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
2008-03-10 12:59:26 +01:00
+
+libx264.la: .depend $(OBJS) $(OBJASM)
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.
2008-12-18 17:19:07 +01:00
+ ${LIBTOOL} --mode=link \
+ ${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
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.
2009-02-03 09:44:15 +01:00
+ $(OBJS) $(OBJASM) ${LDFLAGS}
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
2008-03-10 12:59:26 +01:00
$(SONAME): .depend $(OBJS) $(OBJASM)
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.
2008-12-18 17:19:07 +01:00
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
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
2008-03-10 12:59:26 +01:00
-x264$(EXE): $(OBJCLI) libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
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)
2010-05-04 20:18:57 +02:00
+x264$(EXE): $(OBJCLI) libx264.la
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
2008-03-10 12:59:26 +01:00
+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
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.
2008-12-18 17:19:07 +01:00
-checkasm: tools/checkasm.o libx264.a
- $(CC) -o $@ $+ $(LDFLAGS)
+checkasm: tools/checkasm.lo libx264.la
+ ${LIBTOOL} --mode=link $(CC) -o $@ $+ $(LDFLAGS)
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
2008-03-10 12:59:26 +01:00
-%.o: %.asm
- $(AS) $(ASFLAGS) -o $@ $<
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)
2010-05-04 20:18:57 +02:00
- -@ $(STRIP) -x $@ # delete local/anonymous symbols, so they don't show up in oprofile
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
2008-03-10 12:59:26 +01:00
+%.lo: %.asm
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.
2008-12-18 17:19:07 +01:00
+ ${LIBTOOL} --mode=compile --tag=CC \
+ ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
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)
2010-05-04 20:18:57 +02:00
+ -@ $(STRIP) -x $(@:.lo=.o) # delete local/anonymous symbols, so they don't show up in oprofile
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
2008-03-10 12:59:26 +01:00
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)
2010-05-04 20:18:57 +02:00
%.o: %.S
$(AS) $(ASFLAGS) -o $@ $<
@@ -156,21 +161,16 @@ distclean: clean
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.
2008-12-18 17:19:07 +01:00
rm -f config.mak config.h x264.pc
rm -rf test/
Fix build on Solaris: install -d must be called with only one directory.
2008-07-10 15:40:40 +02:00
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.
2008-12-18 17:19:07 +01:00
-install: x264$(EXE) $(SONAME)
+install: x264$(EXE) libx264.la
install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
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
2008-03-10 12:59:26 +01:00
install -m 644 x264.h $(DESTDIR)$(includedir)
- install -m 644 libx264.a $(DESTDIR)$(libdir)
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.
2008-12-18 17:19:07 +01:00
+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
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
2008-03-10 12:59:26 +01:00
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
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.
2008-12-18 17:19:07 +01:00
- install x264$(EXE) $(DESTDIR)$(bindir)
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.
2009-05-25 22:56:38 +02:00
- $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
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.
2008-12-18 17:19:07 +01:00
+ ${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 -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX))
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
2008-03-10 12:59:26 +01:00
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
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.
2008-12-18 17:19:07 +01:00
endif
- $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
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
2008-03-10 12:59:26 +01:00
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.
2008-12-18 17:19:07 +01:00
uninstall:
rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a
Reference in a new issue Copy permalink