aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/x264-devel/Makefile4
-rw-r--r--multimedia/x264-devel/distinfo6
-rw-r--r--multimedia/x264-devel/files/patch-Makefile19
-rw-r--r--multimedia/x264-devel/files/patch-muxers.c11
-rw-r--r--multimedia/x264/Makefile4
-rw-r--r--multimedia/x264/distinfo6
-rw-r--r--multimedia/x264/files/patch-Makefile19
-rw-r--r--multimedia/x264/files/patch-muxers.c11
8 files changed, 18 insertions, 62 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index c8bc6398848d..600c9cd0f6d1 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x264
-PORTVERSION= 0.0.20060621
+PORTVERSION= 0.0.20060808
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
@@ -20,7 +20,7 @@ USE_GETOPT_LONG=yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
ALL_TARGET= default
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
HAS_CONFIGURE= yes
PLIST_FILES= bin/x264 \
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 510acdba42b8..355df74c17c5 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20060621-2245.tar.bz2) = b901b00890c9857ace7a49f55de50788
-SHA256 (x264-snapshot-20060621-2245.tar.bz2) = 0513a431a881d28e2547c8e48ba78ae6728d546acf3c9a320162fb863dddcc98
-SIZE (x264-snapshot-20060621-2245.tar.bz2) = 515844
+MD5 (x264-snapshot-20060808-2245.tar.bz2) = b4a117177c9545c458a050aac30d3524
+SHA256 (x264-snapshot-20060808-2245.tar.bz2) = 997e74fbf781148b8346346407f9147e525dd72b6606332671baccf7f1475925
+SIZE (x264-snapshot-20060808-2245.tar.bz2) = 517871
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index f50410665714..d648a3b2bed2 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,12 +1,12 @@
---- Makefile.orig Tue May 9 16:45:02 2006
-+++ Makefile Tue May 9 22:14:14 2006
+--- Makefile.orig Wed Aug 9 10:07:14 2006
++++ Makefile Wed Aug 9 10:07:37 2006
@@ -18,7 +18,7 @@
endif
# MMX/SSE optims
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
- SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict-c.c
+ SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \
common/i386/pixel-a.asm common/i386/mc-a.asm \
@@ -30,7 +30,7 @@
@@ -15,17 +15,6 @@
# MMX/SSE optims
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
- SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict-c.c
+ SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
common/amd64/pixel-a.asm common/amd64/mc-a.asm \
-@@ -47,10 +47,6 @@
- endif
-
- # VIS optims
--ifeq ($(ARCH),UltraSparc)
--ASMSRC += common/sparc/pixel.asm
--OBJASM = $(ASMSRC:%.asm=%.o)
--endif
-
- ifneq ($(HAVE_GETOPT_LONG),1)
- SRCS += extras/getopt.c
diff --git a/multimedia/x264-devel/files/patch-muxers.c b/multimedia/x264-devel/files/patch-muxers.c
deleted file mode 100644
index fd20cad4806a..000000000000
--- a/multimedia/x264-devel/files/patch-muxers.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- muxers.c.orig Tue May 9 22:04:27 2006
-+++ muxers.c Tue May 9 22:04:37 2006
-@@ -647,7 +647,7 @@
- return -1;
-
- memset(p_mp4, 0, sizeof(mp4_t));
-- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL);
-+ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE);
-
- if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL)
- {
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index c8bc6398848d..600c9cd0f6d1 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= x264
-PORTVERSION= 0.0.20060621
+PORTVERSION= 0.0.20060808
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/
DISTNAME= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245
@@ -20,7 +20,7 @@ USE_GETOPT_LONG=yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
ALL_TARGET= default
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
HAS_CONFIGURE= yes
PLIST_FILES= bin/x264 \
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 510acdba42b8..355df74c17c5 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,3 +1,3 @@
-MD5 (x264-snapshot-20060621-2245.tar.bz2) = b901b00890c9857ace7a49f55de50788
-SHA256 (x264-snapshot-20060621-2245.tar.bz2) = 0513a431a881d28e2547c8e48ba78ae6728d546acf3c9a320162fb863dddcc98
-SIZE (x264-snapshot-20060621-2245.tar.bz2) = 515844
+MD5 (x264-snapshot-20060808-2245.tar.bz2) = b4a117177c9545c458a050aac30d3524
+SHA256 (x264-snapshot-20060808-2245.tar.bz2) = 997e74fbf781148b8346346407f9147e525dd72b6606332671baccf7f1475925
+SIZE (x264-snapshot-20060808-2245.tar.bz2) = 517871
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index f50410665714..d648a3b2bed2 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -1,12 +1,12 @@
---- Makefile.orig Tue May 9 16:45:02 2006
-+++ Makefile Tue May 9 22:14:14 2006
+--- Makefile.orig Wed Aug 9 10:07:14 2006
++++ Makefile Wed Aug 9 10:07:37 2006
@@ -18,7 +18,7 @@
endif
# MMX/SSE optims
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
- SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict-c.c
+ SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/i386/dct-a.asm common/i386/cpu-a.asm \
common/i386/pixel-a.asm common/i386/mc-a.asm \
@@ -30,7 +30,7 @@
@@ -15,17 +15,6 @@
# MMX/SSE optims
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
- SRCS += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict-c.c
+ SRCS += common/i386/mc-c.c common/i386/predict-c.c
ASMSRC = common/amd64/dct-a.asm common/amd64/cpu-a.asm \
common/amd64/pixel-a.asm common/amd64/mc-a.asm \
-@@ -47,10 +47,6 @@
- endif
-
- # VIS optims
--ifeq ($(ARCH),UltraSparc)
--ASMSRC += common/sparc/pixel.asm
--OBJASM = $(ASMSRC:%.asm=%.o)
--endif
-
- ifneq ($(HAVE_GETOPT_LONG),1)
- SRCS += extras/getopt.c
diff --git a/multimedia/x264/files/patch-muxers.c b/multimedia/x264/files/patch-muxers.c
deleted file mode 100644
index fd20cad4806a..000000000000
--- a/multimedia/x264/files/patch-muxers.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- muxers.c.orig Tue May 9 22:04:27 2006
-+++ muxers.c Tue May 9 22:04:37 2006
-@@ -647,7 +647,7 @@
- return -1;
-
- memset(p_mp4, 0, sizeof(mp4_t));
-- p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL);
-+ p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE);
-
- if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL)
- {