sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update x264 to 0.0.20081218

Browse source 
- Remove x264-gtk

PR:		ports/132780
Submitted by:	Bapt <baptiste.daroussin@gmail.com>

- Update libquicktime to 1.1.1 to fix build with new x264

Submitted by:	kwm

- Chase x264 shlib bump
This commit is contained in:
Pav Lucistnik 2009-03-31 13:58:18 +00:00
parent 35df691a43
commit 694ee5533a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231385
25 changed files with 97 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
multimedia/Makefile
View file

@ -282,7 +282,6 @@
SUBDIR += vtkmpeg2encode
SUBDIR += win32-codecs
SUBDIR += x264
SUBDIR += x264-gtk
SUBDIR += xanim
SUBDIR += xawtv
SUBDIR += xdvshow

4
multimedia/ffmpeg/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= ffmpeg
DISTVERSION= 2008-07-27
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ahze
@ -210,7 +210,7 @@ CONFIGURE_ARGS+= --disable-libvorbis
# x264
.ifndef(WITHOUT_X264)
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
CONFIGURE_ARGS+= --enable-libx264
.else

37
multimedia/ffmpeg/files/patch-libavcodec_libx264.c Normal file
View file

@ -0,0 +1,37 @@
--- ./libavcodec/libx264.c.orig 2008-06-12 23:50:13.000000000 +0200
+++ ./libavcodec/libx264.c 2008-10-13 15:47:05.000000000 +0200
@@ -124,6 +124,8 @@
{
X264Context *x4 = avctx->priv_data;
+ av_freep(&avctx->extradata);
+
if(x4->enc)
x264_encoder_close(x4->enc);
@@ -162,7 +164,7 @@
x4->params.i_bframe = avctx->max_b_frames;
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
- x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
x4->params.i_bframe_bias = avctx->bframebias;
x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
@@ -227,8 +229,6 @@
x4->params.analyse.i_me_range = avctx->me_range;
x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
- x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
- x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
x4->params.analyse.b_mixed_references =
avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
@@ -253,7 +253,6 @@
x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
- x4->params.rc.psz_rc_eq = avctx->rc_eq;
x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
x4->params.i_log_level = X264_LOG_DEBUG;

2
multimedia/gstreamer-plugins-x264/Makefile
View file

@ -6,7 +6,7 @@
# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
#
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin

2
multimedia/gstreamer-plugins/Makefile.common
View file

@ -444,7 +444,7 @@ gst_vorbis_PLIST_FILES= ${GST_LIB_DIR}/libgstvorbis.la \
gst_vorbis_DIST= base
# x264
gst_x264_LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
gst_x264_LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
gst_x264_PLIST_FILES= ${GST_LIB_DIR}/libgstx264.la \
${GST_LIB_DIR}/libgstx264.so
gst_x264_DIST= bad

5
multimedia/libquicktime/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= libquicktime
PORTVERSION= 1.0.3
PORTREVISION= 2
PORTVERSION= 1.1.1
CATEGORIES= multimedia
MASTER_SITES= SFE
@ -130,7 +129,7 @@ CONFIGURE_ARGS+= --without-faad2
.endif
.if !defined(WITHOUT_X264)
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
PLIST_SUB+= X264=""
CONFIGURE_ARGS+= --with-x264
.else

6
multimedia/libquicktime/distinfo
View file

@ -1,3 +1,3 @@
MD5 (libquicktime-1.0.3.tar.gz) = 823191104cdd665c75d447c8f5f8bf7e
SHA256 (libquicktime-1.0.3.tar.gz) = 72aa1c21539cecf08ced57386541fd092dd5957677c77e4c7ddc4d7c30df769a
SIZE (libquicktime-1.0.3.tar.gz) = 1003262
MD5 (libquicktime-1.1.1.tar.gz) = 88df838a450b6c6768819d45bacc0926
SHA256 (libquicktime-1.1.1.tar.gz) = 90efa1a836133680669cac743b726608720ad8f3aadcdb71ff1e29e510bd0d13
SIZE (libquicktime-1.1.1.tar.gz) = 1009816

4
multimedia/lives/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= lives
DISTVERSION= 0.9.8.10
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= multimedia
MASTER_SITES= http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES
DISTNAME= LiVES-${DISTVERSION}
@ -26,7 +26,7 @@ LIB_DEPENDS= MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
matroska.0:${PORTSDIR}/multimedia/libmatroska \
oil-0.3.0:${PORTSDIR}/devel/liboil \
mjpegutils-1.9.1:${PORTSDIR}/multimedia/mjpegtools \
x264.50:${PORTSDIR}/multimedia/x264
x264.65:${PORTSDIR}/multimedia/x264
BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
mencoder:${PORTSDIR}/multimedia/mencoder \

4
multimedia/mpeg4ip/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= mpeg4ip
PORTVERSION= 1.6.1
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= LOCAL/ahze
# http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136
@ -27,7 +27,7 @@ LIB_DEPENDS= faac.0:${PORTSDIR}/audio/faac \
a52.0:${PORTSDIR}/audio/liba52 \
mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
x264.50:${PORTSDIR}/multimedia/x264
x264.65:${PORTSDIR}/multimedia/x264
RUN_DEPENDS= mpeg4ip-libmp4v2>=1.6.1:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2
USE_GNOME= gtk20

2
multimedia/mplayer/Makefile.options
View file

@ -100,7 +100,7 @@ CONFIGURE_ARGS+= --disable-libdv
.endif
.if defined(WITH_X264)
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+= --disable-x264
.endif

4
multimedia/vlc/Makefile
View file

@ -10,7 +10,7 @@
PORTNAME= vlc
DISTVERSION= 0.9.8a
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 3
CATEGORIES= multimedia audio ipv6 net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@ -335,7 +335,7 @@ CONFIGURE_ARGS+=--disable-schroedinger
.if !defined(WITHOUT_X264)
CONFIGURE_ARGS+=--enable-x264
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
LIB_DEPENDS+= x264.65:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+=--disable-x264
.endif

30
multimedia/x264-devel/Makefile
View file

@ -6,8 +6,7 @@
# $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
PORTNAME= x264
PORTVERSION= 0.0.20080409
PORTREVISION?= 2
PORTVERSION= 0.0.20081218
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@ -21,19 +20,19 @@ COMMENT?= Multimedia library and tool for encoding H.264/AVC video streams
BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm
WANT_GNOME= yes
USE_BZIP2= yes
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
ALL_TARGET= default
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
OPTIONS= DEBUG "Enable Debugging" Off \
OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
PGO "Enable Profile-Guided Optimization" Off
PGO "Enable Profile-Guided Optimization" Off \
GPAC "Enable MPEG-4 Output" On \
X11_OUTPUT "Enable X11 Output" Off
CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \
--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
@ -41,19 +40,6 @@ CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
.include <bsd.port.pre.mk>
.if defined(WITH_GTK2) && ${SLAVE_PORT:L}=="yes"
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
BUILD_WRKSRC= ${WRKSRC}/gtk
INSTALL_WRKSRC= ${WRKSRC}/gtk
ALL_TARGET= all
USE_GETTEXT= yes
USE_GNOME= gtk20
CONFIGURE_ARGS+= --enable-gtk
.else
OPTIONS+= GPAC "Enable MPEG-4 Output" On \
X11_OUTPUT "Enable X11 Output" Off
.endif
.if ${ARCH}=="i386"
MAKE_ENV+= ARCH_X86="1"
.endif
@ -99,12 +85,14 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
s|-lpthread|${PTHREAD_LIBS}|g' \
s|-lpthread|${PTHREAD_LIBS}|g; \
s|bash|sh|; \
s|gpac_static|gpac|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/Makefile \
${WRKSRC}/*/Makefile
${WRKSRC}/Makefile
.if ${SLAVE_PORT:L}=="no"
.if 0 # BROKEN

9
multimedia/x264-devel/distinfo
View file

@ -1,6 +1,3 @@
MD5 (x264/x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
SHA256 (x264/x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
SIZE (x264/x264-snapshot-20080409-2245.tar.bz2) = 1919929
MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
MD5 (x264/x264-snapshot-20081218-2245.tar.bz2) = a5034835110bf3302539648323c73517
SHA256 (x264/x264-snapshot-20081218-2245.tar.bz2) = 729fbdd18d4e84980fb8533cdf60379f86728e950277370c226486d2a7857167
SIZE (x264/x264-snapshot-20081218-2245.tar.bz2) = 2336724

21
multimedia/x264-devel/files/patch-Makefile
View file

@ -1,20 +1,17 @@
--- Makefile.orig 2008-04-09 16:45:06.000000000 -0400
+++ Makefile 2008-04-09 20:47:32.490510083 -0400
@@ -26,7 +26,7 @@
cpu-32.asm dct-32.asm
--- ./Makefile.orig 2008-12-18 22:45:07.000000000 +0100
+++ ./Makefile 2009-03-17 19:09:28.000000000 +0100
@@ -26,12 +26,12 @@
cpu-a.asm dct-32.asm
X86SRC = $(X86SRC0:%=common/x86/%)
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
SRCS += common/x86/mc-c.c common/x86/predict-c.c
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
OBJASM = $(ASMSRC:%.asm=%.o)
@@ -35,7 +35,7 @@
checkasm: tools/checkasm-32.o
ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
endif
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
SRCS += common/x86/mc-c.c common/x86/predict-c.c
ASMSRC = $(X86SRC:-32.asm=-64.asm)
OBJASM = $(ASMSRC:%.asm=%.o)
ARCH_X86 = yes
ASMSRC = $(X86SRC:-32.asm=-64.asm)
ASFLAGS += -DARCH_X86_64

29
multimedia/x264-devel/files/patch-configure
View file

@ -1,29 +0,0 @@
--- configure.orig 2008-04-09 16:45:06.000000000 -0400
+++ configure 2008-04-09 20:48:37.722733173 -0400
@@ -248,7 +248,7 @@
fi
as_check || AS="nasm"
;;
- x86_64)
+ x86_64 | amd64)
ARCH="X86_64"
AS="yasm"
if [ "$SYS" = MACOSX ];then
@@ -372,7 +372,7 @@
LDFLAGS="$LDFLAGS $libpthread"
fi
-MP4_LDFLAGS="-lgpac_static"
+MP4_LDFLAGS="-lgpac"
if [ $SYS = MINGW ]; then
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
fi
@@ -458,7 +458,7 @@
cp config.mak gtk/config.mak
if [ "$shared" = "yes" ]; then
- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
+ API=50
if [ "$SYS" = "MINGW" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
echo 'IMPLIBNAME=libx264.dll.a' >> config.mak

20
multimedia/x264-devel/files/patch-gtk_Makefile
View file

@ -1,20 +0,0 @@
--- gtk/Makefile.orig Fri Jun 1 08:18:59 2007
+++ gtk/Makefile Fri Jun 1 08:19:28 2007
@@ -46,14 +46,14 @@
X264GTK_PC = x264gtk.pc
-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
+EXTERNAL_DEPS= ../muxers.o ../matroska.o
all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
# Already provides iconv/intl
-CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
+CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0 x264` -I.. -DX264_DATA_DIR=\"${datadir}\"
+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
# gettext rules

2
multimedia/x264-devel/pkg-plist
View file

@ -2,5 +2,5 @@ bin/x264
include/x264.h
lib/libx264.a
lib/libx264.so
lib/libx264.so.50
lib/libx264.so.65
libdata/pkgconfig/x264.pc

17
multimedia/x264-gtk/Makefile
View file

@ -1,17 +0,0 @@
# New ports collection makefile for: x264-gtk
# Date created: 2007-06-01
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
#
PORTREVISION= 1
PKGNAMESUFFIX= -gtk
MAINTAINER= multimedia@FreeBSD.org
WITH_GTK2= yes
PLIST= ${.CURDIR}/pkg-plist
MASTERDIR= ${.CURDIR}/../../multimedia/x264
.include "${MASTERDIR}/Makefile"

10
multimedia/x264-gtk/pkg-plist
View file

@ -1,10 +0,0 @@
bin/x264_gtk_encode
include/x264_gtk.h
include/x264_gtk_enum.h
lib/libx264gtk.a
lib/libx264gtk.so
lib/libx264gtk.so.50
libdata/pkgconfig/x264gtk.pc
share/locale/fr/LC_MESSAGES/x264_gtk.mo
%%DATADIR%%/x264.png
@dirrm %%DATADIR%%

30
multimedia/x264/Makefile
View file

@ -6,8 +6,7 @@
# $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
PORTNAME= x264
PORTVERSION= 0.0.20080409
PORTREVISION?= 2
PORTVERSION= 0.0.20081218
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@ -21,19 +20,19 @@ COMMENT?= Multimedia library and tool for encoding H.264/AVC video streams
BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm
WANT_GNOME= yes
USE_BZIP2= yes
EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_GMAKE= yes
ALL_TARGET= default
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
OPTIONS= DEBUG "Enable Debugging" Off \
OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off \
PGO "Enable Profile-Guided Optimization" Off
PGO "Enable Profile-Guided Optimization" Off \
GPAC "Enable MPEG-4 Output" On \
X11_OUTPUT "Enable X11 Output" Off
CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${LOCALBASE}/include" \
--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
@ -41,19 +40,6 @@ CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
.include <bsd.port.pre.mk>
.if defined(WITH_GTK2) && ${SLAVE_PORT:L}=="yes"
LIB_DEPENDS+= x264.50:${PORTSDIR}/multimedia/x264
BUILD_WRKSRC= ${WRKSRC}/gtk
INSTALL_WRKSRC= ${WRKSRC}/gtk
ALL_TARGET= all
USE_GETTEXT= yes
USE_GNOME= gtk20
CONFIGURE_ARGS+= --enable-gtk
.else
OPTIONS+= GPAC "Enable MPEG-4 Output" On \
X11_OUTPUT "Enable X11 Output" Off
.endif
.if ${ARCH}=="i386"
MAKE_ENV+= ARCH_X86="1"
.endif
@ -99,12 +85,14 @@ post-extract:
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
s|-lpthread|${PTHREAD_LIBS}|g' \
s|-lpthread|${PTHREAD_LIBS}|g; \
s|bash|sh|; \
s|gpac_static|gpac|g' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/Makefile \
${WRKSRC}/*/Makefile
${WRKSRC}/Makefile
.if ${SLAVE_PORT:L}=="no"
.if 0 # BROKEN

9
multimedia/x264/distinfo
View file

@ -1,6 +1,3 @@
MD5 (x264/x264-snapshot-20080409-2245.tar.bz2) = 2a1b0ad913885cfde72159671ad51280
SHA256 (x264/x264-snapshot-20080409-2245.tar.bz2) = 6a921b0fc21cf508fd4df003b400903dee50cc046e3d4a8570aef34f4a000b32
SIZE (x264/x264-snapshot-20080409-2245.tar.bz2) = 1919929
MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
MD5 (x264/x264-snapshot-20081218-2245.tar.bz2) = a5034835110bf3302539648323c73517
SHA256 (x264/x264-snapshot-20081218-2245.tar.bz2) = 729fbdd18d4e84980fb8533cdf60379f86728e950277370c226486d2a7857167
SIZE (x264/x264-snapshot-20081218-2245.tar.bz2) = 2336724

21
multimedia/x264/files/patch-Makefile
View file

@ -1,20 +1,17 @@
--- Makefile.orig 2008-04-09 16:45:06.000000000 -0400
+++ Makefile 2008-04-09 20:47:32.490510083 -0400
@@ -26,7 +26,7 @@
cpu-32.asm dct-32.asm
--- ./Makefile.orig 2008-12-18 22:45:07.000000000 +0100
+++ ./Makefile 2009-03-17 19:09:28.000000000 +0100
@@ -26,12 +26,12 @@
cpu-a.asm dct-32.asm
X86SRC = $(X86SRC0:%=common/x86/%)
-ifeq ($(ARCH),X86)
+ifeq ($(ARCH),i386)
SRCS += common/x86/mc-c.c common/x86/predict-c.c
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
OBJASM = $(ASMSRC:%.asm=%.o)
@@ -35,7 +35,7 @@
checkasm: tools/checkasm-32.o
ARCH_X86 = yes
ASMSRC = $(X86SRC) common/x86/pixel-32.asm
endif
-ifeq ($(ARCH),X86_64)
+ifeq ($(ARCH),amd64)
SRCS += common/x86/mc-c.c common/x86/predict-c.c
ASMSRC = $(X86SRC:-32.asm=-64.asm)
OBJASM = $(ASMSRC:%.asm=%.o)
ARCH_X86 = yes
ASMSRC = $(X86SRC:-32.asm=-64.asm)
ASFLAGS += -DARCH_X86_64

29
multimedia/x264/files/patch-configure
View file

@ -1,29 +0,0 @@
--- configure.orig 2008-04-09 16:45:06.000000000 -0400
+++ configure 2008-04-09 20:48:37.722733173 -0400
@@ -248,7 +248,7 @@
fi
as_check || AS="nasm"
;;
- x86_64)
+ x86_64 | amd64)
ARCH="X86_64"
AS="yasm"
if [ "$SYS" = MACOSX ];then
@@ -372,7 +372,7 @@
LDFLAGS="$LDFLAGS $libpthread"
fi
-MP4_LDFLAGS="-lgpac_static"
+MP4_LDFLAGS="-lgpac"
if [ $SYS = MINGW ]; then
MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm"
fi
@@ -458,7 +458,7 @@
cp config.mak gtk/config.mak
if [ "$shared" = "yes" ]; then
- API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ')
+ API=50
if [ "$SYS" = "MINGW" ]; then
echo "SONAME=libx264-$API.dll" >> config.mak
echo 'IMPLIBNAME=libx264.dll.a' >> config.mak

20
multimedia/x264/files/patch-gtk_Makefile
View file

@ -1,20 +0,0 @@
--- gtk/Makefile.orig Fri Jun 1 08:18:59 2007
+++ gtk/Makefile Fri Jun 1 08:19:28 2007
@@ -46,14 +46,14 @@
X264GTK_PC = x264gtk.pc
-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
+EXTERNAL_DEPS= ../muxers.o ../matroska.o
all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
# Already provides iconv/intl
-CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
+CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0 x264` -I.. -DX264_DATA_DIR=\"${datadir}\"
+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
# gettext rules

2
multimedia/x264/pkg-plist
View file

@ -2,5 +2,5 @@ bin/x264
include/x264.h
lib/libx264.a
lib/libx264.so
lib/libx264.so.50
lib/libx264.so.65
libdata/pkgconfig/x264.pc