Date: Fri, 5 Dec 2014 08:32:19 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373996 - in head/graphics: . seom seom/files Message-ID: <201412050832.sB58WJ46072959@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Fri Dec 5 08:32:18 2014 New Revision: 373996 URL: https://svnweb.freebsd.org/changeset/ports/373996 QAT: https://qat.redports.org/buildarchive/r373996/ Log: - Resurrect, unbreak, stagify, etc. - Requires GNU make to build, add it to USES - Links to libXext.so, thus amend USE_XORG - Contract MASTER_SITES, cleanup pkg-plist Added: head/graphics/seom/ - copied from r337199, head/graphics/seom/ head/graphics/seom/files/patch-seom.pc.in (contents, props changed) Modified: head/graphics/Makefile head/graphics/seom/Makefile head/graphics/seom/files/patch-Makefile head/graphics/seom/pkg-descr head/graphics/seom/pkg-plist Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Dec 5 08:30:24 2014 (r373995) +++ head/graphics/Makefile Fri Dec 5 08:32:18 2014 (r373996) @@ -954,6 +954,7 @@ SUBDIR += sdl_ttf SUBDIR += seam-carving-gui SUBDIR += seejpeg + SUBDIR += seom SUBDIR += separate SUBDIR += seq2gif SUBDIR += shared-color-profiles Modified: head/graphics/seom/Makefile ============================================================================== --- head/graphics/seom/Makefile Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/seom/Makefile Fri Dec 5 08:32:18 2014 (r373996) @@ -1,40 +1,33 @@ -# Created by: bms +# Created by: Bruce M Simpson <bms@FreeBSD.org> # $FreeBSD$ PORTNAME= seom PORTVERSION= 2010011201 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= bms -DISTNAME= seom-${PORTVERSION} +MASTER_SITES= LOCAL/bms MAINTAINER= ports@FreeBSD.org COMMENT= Real-time capture library for OpenGL applications -NOMAN= defined +LICENSE= GPLv2 -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-12-22 - -BROKEN= fails to package +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= not yet ported to anything except i386 and amd64 -USE_BZIP2= yes -USE_GCC= 4.2+ -USE_XORG= x11 xv -USE_GL= yes +USES= gmake tar:bzip2 +USE_XORG= x11 xv xext +USE_GL= gl USE_LDCONFIG= yes +MAKE_ENV= DATADIR="${DATADIR}" -NO_STAGE= yes .include <bsd.port.pre.mk> -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= "not yet ported to anything other than i386 and amd64" - -.if ${ARCH} == "i386" || ${ARCH} == "amd64" -BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm +.if ${ARCH} == i386 || ${ARCH} == amd64 +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .endif -MAKE_ENV+= DATADIR="${DATADIR}" PREFIX="${PREFIX}" +post-patch: + @${ECHO_CMD} 1.0-196 > ${WRKSRC}/VERSION # # To roll snapshot: as bms: make BOOTSTRAP=defined fetch Modified: head/graphics/seom/files/patch-Makefile ============================================================================== --- head/graphics/seom/files/patch-Makefile Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/seom/files/patch-Makefile Fri Dec 5 08:32:18 2014 (r373996) @@ -1,6 +1,6 @@ ---- Makefile 2007-03-27 15:23:25.000000000 -0400 -+++ Makefile 2013-02-07 12:32:37.000000000 -0500 -@@ -1,20 +1,27 @@ +--- Makefile.orig 2007-03-27 19:23:25 UTC ++++ Makefile +@@ -1,35 +1,43 @@ +.SUFFIXES: .c .o .asm MAJOR = 0 @@ -13,7 +13,8 @@ LIBDIR = lib +LIBDATADIR = libdata - CC = gcc +-CC = gcc ++CC ?= gcc ASM = yasm -CFLAGS = -Iinclude -std=c99 @@ -24,25 +25,25 @@ +###include config.make + +ARCH = C -+CFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib ++CFLAGS += -I${LOCALBASE}/include ++LDFLAGS += -L${LOCALBASE}/lib OBJS = src/buffer.o src/client.o src/codec.o src/frame.o src/opengl.o \ - src/server.o src/stream.o src/arch/$(ARCH)/frame.o -+ src/server.o src/stream.o src/arch/${ARCH:S/i386/x86/g}/frame.o ++ src/server.o src/stream.o src/arch/$(subst i3,x,$(ARCH))/frame.o APPS = filter player server - playerLIBS = -lX11 -lXv -@@ -22,14 +29,14 @@ +-playerLIBS = -lX11 -lXv ++playerLIBS = -lX11 -lXv -lXext + .PHONY: all clean install all: $(LIBRARY) $(APPS) --%.o: %.asm + %.o: %.asm - $(ASM) -m $(ARCH) -f elf -o $@ $< -+.asm.o: -+ $(ASM) -m ${ARCH:S/i386/x86/g} -f elf -o $@ $< ++ $(ASM) -m $(subst i3,x,$(ARCH)) -f elf -o $@ $< --%.o: %.c -+.c.o: + %.o: %.c $(CC) $(CFLAGS) -fPIC -c -o $@ $< $(LIBRARY): $(OBJS) @@ -51,7 +52,7 @@ $(APPS): $(LIBRARY) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ src/$@/main.c -lseom $($@LIBS) -@@ -39,11 +46,11 @@ +@@ -39,11 +47,11 @@ seom.pc: seom.pc.in inst = install -m 755 -d $(DESTDIR)$(3); install -m $(1) $(2) $(DESTDIR)$(3)$(if $(4),/$(4)); install: $(LIBRARY) $(APPS) seom.pc Added: head/graphics/seom/files/patch-seom.pc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/seom/files/patch-seom.pc.in Fri Dec 5 08:32:18 2014 (r373996) @@ -0,0 +1,15 @@ +--- seom.pc.in.orig 2007-01-19 15:04:13 UTC ++++ seom.pc.in +@@ -1,9 +1,9 @@ + #!/bin/sh + +-if which svn &>/dev/null && svn info &>/dev/null; then +- VERSION="1.0-$(svn info | grep Revision | sed 's#Revision: ##')" +-elif [ -e VERSION ]; then ++if [ -e VERSION ]; then + VERSION=$(cat VERSION 2>/dev/null) ++elif which svn &>/dev/null && svn info &>/dev/null; then ++ VERSION="1.0-$(svn info | grep Revision | sed 's#Revision: ##')" + else + exit + fi Modified: head/graphics/seom/pkg-descr ============================================================================== --- head/graphics/seom/pkg-descr Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/seom/pkg-descr Fri Dec 5 08:32:18 2014 (r373996) @@ -3,4 +3,4 @@ capture realtime videos of OpenGL applic design idea is based on Anandtech's FrameGetter, but was extended to suit today's high-performance computers. -WWW: https://devel.neopsis.com/projects/yukon/ +WWW: https://github.com/wereHamster/yukon Modified: head/graphics/seom/pkg-plist ============================================================================== --- head/graphics/seom/pkg-plist Sun Dec 22 16:32:32 2013 (r337199) +++ head/graphics/seom/pkg-plist Fri Dec 5 08:32:18 2014 (r373996) @@ -13,7 +13,3 @@ include/seom/seom.h include/seom/server.h include/seom/stream.h %%DATADIR%%/seom.svg -@dirrmtry libdata/pkgconfig -@dirrmtry libdata -@dirrm include/seom -@dirrm share/seom
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412050832.sB58WJ46072959>