kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 20100724 (build 104)

Browse source
This commit is contained in:
Martin Matuska 2010-07-25 16:37:32 +00:00
parent a60787c69e
commit ae939f08d6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258241
4 changed files with 36 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
multimedia/x264-devel/Makefile
View file

@ -6,7 +6,7 @@
# $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
PORTNAME= x264
PORTVERSION= 0.0.20100420
PORTVERSION= 0.0.20100724
CATEGORIES= multimedia
MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@ -16,13 +16,13 @@ DIST_SUBDIR= x264
EXTRACT_ONLY= ${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
MAINTAINER= mm@FreeBSD.org
COMMENT?= Library and tool for encoding H.264/AVC video streams
CONFLICTS= x264-0.0.2009* x264-0.0.20100[1-2]*
COMMENT= Library and tool for encoding H.264/AVC video streams
BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm \
${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
CONFLICTS= x264-0.0.2009* x264-0.0.20100[1-6]*
LATEST_LINK= x264-devel
USE_BZIP2= yes

9
multimedia/x264-devel/distinfo
View file

@ -1,6 +1,3 @@
MD5 (x264/x264-snapshot-20100420-2245.tar.bz2) = ea874a8ce8b359f148e5e5a59de2a8de
SHA256 (x264/x264-snapshot-20100420-2245.tar.bz2) = 0abd59e3079c43f6be45b11b0cb4b016731d8b2813db95116a4ee665fd3e8af0
SIZE (x264/x264-snapshot-20100420-2245.tar.bz2) = 415956
MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
MD5 (x264/x264-snapshot-20100724-2245.tar.bz2) = 87e34688b444ec735416a7d55574e6b3
SHA256 (x264/x264-snapshot-20100724-2245.tar.bz2) = bdf943fc5e268afe175097636afd3295d849b43af40d5fa9e81cc5d54a143c24
SIZE (x264/x264-snapshot-20100724-2245.tar.bz2) = 445640

57
multimedia/x264-devel/files/patch-common_cpu.c
View file

@ -1,30 +1,29 @@
--- common/cpu.c.orig 2010-02-28 10:49:54.000000000 -0800
+++ common/cpu.c 2010-02-28 10:56:06.000000000 -0800
@@ -211,6 +211,27 @@
return cpu;
}
--- common/cpu.c.orig 2010-06-24 22:45:07.000000000 +0200
+++ common/cpu.c 2010-07-18 22:55:49.324572565 +0200
@@ -234,7 +234,7 @@
+#elif defined(SYS_FREEBSD)
+#include <sys/sysctl.h>
+uint32_t x264_cpu_detect( void )
+{
+ uint32_t cpu;
+ int has_altivec, error;
+ size_t length;
+
+ cpu = 0;
+ has_altivec = 0;
+ length = sizeof( has_altivec );
+ error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
+
+ if( error == 0 && has_altivec != 0 )
+ {
+ cpu |= X264_CPU_ALTIVEC;
+ }
+
+ return cpu;
+}
+
#elif defined( SYS_LINUX )
#include <signal.h>
#include <setjmp.h>
#elif ARCH_PPC
-#if SYS_MACOSX || SYS_OPENBSD
+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
#include <sys/sysctl.h>
uint32_t x264_cpu_detect( void )
{
@@ -242,12 +242,16 @@
uint32_t cpu = 0;
#if SYS_OPENBSD
int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
-#else
+#elif SYS_MACOSX
int selectors[2] = { CTL_HW, HW_VECTORUNIT };
#endif
int has_altivec = 0;
size_t length = sizeof( has_altivec );
+#if SYS_MACOSX || SYS_OPENBSD
int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
+#else
+ int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 );
+#endif
if( error == 0 && has_altivec != 0 )
cpu |= X264_CPU_ALTIVEC;

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.93
lib/libx264.so.104
libdata/pkgconfig/x264.pc