aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMichael Johnson <ahze@FreeBSD.org>2005-09-14 09:20:43 +0000
committerMichael Johnson <ahze@FreeBSD.org>2005-09-14 09:20:43 +0000
commitd6fa806160d9266bd05dd42ddd92d61f01a40e36 (patch)
treeeb5b666e725ac0079a1cc9f758ad3c4d7ce6e406 /multimedia
parentb31c0cf38acd409e88e5cf361baf986ef5aae1a0 (diff)
downloadports-d6fa806160d9266bd05dd42ddd92d61f01a40e36.tar.gz
ports-d6fa806160d9266bd05dd42ddd92d61f01a40e36.zip
Notes
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/x264-devel/Makefile14
-rw-r--r--multimedia/x264-devel/distinfo4
-rw-r--r--multimedia/x264-devel/files/patch-Makefile22
-rw-r--r--multimedia/x264/Makefile14
-rw-r--r--multimedia/x264/distinfo4
-rw-r--r--multimedia/x264/files/patch-Makefile22
6 files changed, 40 insertions, 40 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index e9540f3cb077..95316bac1505 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x264
-PORTVERSION= 0.0.20050712
+PORTVERSION= 0.0.20050914
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|ahze/|} \
http://people.freebsd.org/~ahze/distfiles/
@@ -35,10 +35,11 @@ PLIST_FILES= bin/x264 \
OPTIONS= GPAC "Enable MPEG-4 Output" On \
DEBUG "Enable Debugging" Off \
- OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
+ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
+ X11_OUTPUT "Enable X11 Output" Off
-CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
- --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
+ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
# --enable-pthread
.include <bsd.port.pre.mk>
@@ -66,6 +67,11 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libm4systems_static.a:${PORTSDIR}/multimedia/g
CONFIGURE_ARGS+= --enable-mp4-output
.endif
+.if defined(WITH_X11_OUTPUT)
+CONFIGURE_ARGS+= --enable-visualize
+USE_XLIB= yes
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index e9ad95b08c4f..b97c582f3425 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20050712.tar.bz2) = d95667f130134cb8bc57a8a34029ba56
-SIZE (x264-20050712.tar.bz2) = 222451
+MD5 (x264-20050914.tar.bz2) = e3e739423a5d1c82bb760dd02ebfca54
+SIZE (x264-20050914.tar.bz2) = 226480
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 67ce9269a154..1a4e489bdd4f 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Wed May 18 22:55:05 2005
-+++ Makefile Wed May 18 22:56:31 2005
+--- Makefile.orig Wed Sep 14 04:50:13 2005
++++ Makefile Wed Sep 14 04:55:01 2005
@@ -15,7 +15,7 @@
endif
@@ -9,33 +9,27 @@
SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \
common/i386/pixel-a.asm common/i386/mc-a.asm \
-@@ -40,19 +40,25 @@
+@@ -55,14 +55,20 @@
OBJS = $(SRCS:%.c=%.o)
DEP = depend
-default: $(DEP) x264$(EXE)
+SHARED_LIB = libx264.so
+SHARED_LIB_VER = $(SHARED_LIB).1
-+
++
+default: $(DEP) x264$(EXE) $(SHARED_LIB_VER)
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
ranlib libx264.a
--x264$(EXE): libx264.a x264.o
-- $(CC) -o $@ x264.o libx264.a $(LDFLAGS)
-+x264$(EXE): $(SHARED_LIB_VER) x264.o
-+ $(CC) -o $@ x264.o $(SHARED_LIB_VER) $(LDFLAGS)
+-x264$(EXE): libx264.a x264.o matroska.o
+- $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
++x264$(EXE): $(SHARED_LIB_VER) x264.o matroska.o
++ $(CC) -o $@ x264.o matroska.o $(SHARED_LIB_VER) $(LDFLAGS)
+
+$(SHARED_LIB_VER): $(OBJS) libx264.a
+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) $(LDFLAGS)
x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h)
make -C vfw/build/cygwin
-
--checkasm: testing/checkasm.o libx264.a
-+checkasm: testing/checkasm.o $(SHARED_LIB_VER)
- $(CC) -o $@ $< libx264.a $(LDFLAGS)
-
- %.o: %.asm
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index e9540f3cb077..95316bac1505 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x264
-PORTVERSION= 0.0.20050712
+PORTVERSION= 0.0.20050914
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_LOCAL:S|$|ahze/|} \
http://people.freebsd.org/~ahze/distfiles/
@@ -35,10 +35,11 @@ PLIST_FILES= bin/x264 \
OPTIONS= GPAC "Enable MPEG-4 Output" On \
DEBUG "Enable Debugging" Off \
- OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
+ OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
+ X11_OUTPUT "Enable X11 Output" Off
-CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \
- --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib"
+CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
+ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
# --enable-pthread
.include <bsd.port.pre.mk>
@@ -66,6 +67,11 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libm4systems_static.a:${PORTSDIR}/multimedia/g
CONFIGURE_ARGS+= --enable-mp4-output
.endif
+.if defined(WITH_X11_OUTPUT)
+CONFIGURE_ARGS+= --enable-visualize
+USE_XLIB= yes
+.endif
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/x264 ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/x264.h ${PREFIX}/include
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index e9ad95b08c4f..b97c582f3425 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20050712.tar.bz2) = d95667f130134cb8bc57a8a34029ba56
-SIZE (x264-20050712.tar.bz2) = 222451
+MD5 (x264-20050914.tar.bz2) = e3e739423a5d1c82bb760dd02ebfca54
+SIZE (x264-20050914.tar.bz2) = 226480
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index 67ce9269a154..1a4e489bdd4f 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Wed May 18 22:55:05 2005
-+++ Makefile Wed May 18 22:56:31 2005
+--- Makefile.orig Wed Sep 14 04:50:13 2005
++++ Makefile Wed Sep 14 04:55:01 2005
@@ -15,7 +15,7 @@
endif
@@ -9,33 +9,27 @@
SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \
common/i386/pixel-a.asm common/i386/mc-a.asm \
-@@ -40,19 +40,25 @@
+@@ -55,14 +55,20 @@
OBJS = $(SRCS:%.c=%.o)
DEP = depend
-default: $(DEP) x264$(EXE)
+SHARED_LIB = libx264.so
+SHARED_LIB_VER = $(SHARED_LIB).1
-+
++
+default: $(DEP) x264$(EXE) $(SHARED_LIB_VER)
libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
ranlib libx264.a
--x264$(EXE): libx264.a x264.o
-- $(CC) -o $@ x264.o libx264.a $(LDFLAGS)
-+x264$(EXE): $(SHARED_LIB_VER) x264.o
-+ $(CC) -o $@ x264.o $(SHARED_LIB_VER) $(LDFLAGS)
+-x264$(EXE): libx264.a x264.o matroska.o
+- $(CC) -o $@ x264.o matroska.o libx264.a $(LDFLAGS)
++x264$(EXE): $(SHARED_LIB_VER) x264.o matroska.o
++ $(CC) -o $@ x264.o matroska.o $(SHARED_LIB_VER) $(LDFLAGS)
+
+$(SHARED_LIB_VER): $(OBJS) libx264.a
+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) $(LDFLAGS)
x264vfw.dll: libx264.a $(wildcard vfw/*.c vfw/*.h)
make -C vfw/build/cygwin
-
--checkasm: testing/checkasm.o libx264.a
-+checkasm: testing/checkasm.o $(SHARED_LIB_VER)
- $(CC) -o $@ $< libx264.a $(LDFLAGS)
-
- %.o: %.asm