Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv13742
Added Files:
xvidcore.info xvidcore.patch
Log Message:
to 10.7
--- NEW FILE: xvidcore.patch ---
--- xvidcore/build/generic/configure.orig 2009-05-28 13:13:31.000000000
-0400
+++ xvidcore/build/generic/configure 2011-02-22 16:38:01.000000000 -0500
@@ -1319,7 +1319,7 @@
API_MAJOR="4"
API_MINOR="2"
-minimum_yasm_minor_version=8
+minimum_yasm_major_version=1
minimum_nasm_minor_version=0
minimum_nasm_major_version=2
nasm_prog="nasm"
@@ -3977,14 +3977,14 @@
if test "$ac_yasm" = "yes" ; then
echo "$as_me:$LINENO: checking for yasm version"
>&5
echo $ECHO_N "checking for yasm version... $ECHO_C" >&6
- yasm_minor=`$yasm_prog --version | cut -d '.' -f 2 | cut -d ' ' -f 1`
- if test -z $yasm_minor ; then
- yasm_minor=-1
+ yasm_major=`$yasm_prog --version | head -n 1 | cut -d '.' -f 1 | cut -d
' ' -f 2`
+ if test -z $yasm_major ; then
+ yasm_major=-1
fi
- echo "$as_me:$LINENO: result: $yasm_minor" >&5
-echo "${ECHO_T}$yasm_minor" >&6
+ echo "$as_me:$LINENO: result: $yasm_major" >&5
+echo "${ECHO_T}$yasm_major" >&6
- if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ;
then
+ if test "$yasm_major" -lt "$minimum_yasm_major_version" ;
then
{ echo "$as_me:$LINENO: WARNING: yasm version is too old" >&5
echo "$as_me: WARNING: yasm version is too old" >&2;}
else
--- xvidcore/src/xvid.c.orig 2009-02-28 00:13:41 -0600
+++ xvidcore/src/xvid.c 2009-02-28 00:13:45 -0600
@@ -32,6 +32,17 @@
#include <unistd.h>
#endif
+#if defined(__APPLE__) && defined(__MACH__)
+# include <sys/types.h>
+# include <sys/sysctl.h>
+# ifdef MAX
+# undef MAX
+# endif
+# ifdef MIN
+# undef MIN
+# endif
+#endif
+
#include "xvid.h"
#include "decoder.h"
#include "encoder.h"
@@ -677,10 +682,29 @@
info->num_threads = siSysInfo.dwNumberOfProcessors; /* number of
_logical_ cores */
}
-#else
+#elif defined(__APPLE__) && defined(__MACH__)
+
+ {
+ size_t len;
+ int mib[2], ncpu;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ len = sizeof(ncpu);
+ if (sysctl(mib, 2, &ncpu, &len, NULL, 0) == 0)
+ info -> num_threads = ncpu;
+ else
+ info -> num_threads = 1;
+ }
+
+#elif defined(_SC_NPROCESSORS_CONF)
info->num_threads = sysconf(_SC_NPROCESSORS_CONF);
+#else
+
+ info->num_threads = 1;
+
#endif
return 0;
--- NEW FILE: xvidcore.info ---
Package: xvidcore
Version: 1.3.2
Revision: 1
BuildDependsOnly: True
###
Conflicts: xvid
Replaces: xvid
BuildDepends: <<
fink (>= 0.24.12),
yasm (>= 1.1.0-1)
<<
Depends: %N-shlibs (= %v-%r)
###
Source: http://downloads.xvid.org/downloads/%n-%v.tar.gz
Source-MD5: 87c8cf7b69ebed93c2d82ea5709d098a
SourceDirectory: xvidcore
###
### patch fixes misguided yasm version detection. Fixes are present in
xvid-1.3RC1
# PatchFile: %n.patch
# PatchFile-MD5: cdd3227f6477e3b0a7e9e4d78d1f6d95
PatchScript: <<
#!/bin/sh -ev
# %{default_script}
perl -pi -e 's, \-freduce\-all\-givs,,' build/generic/configure
### yasm on x86_64 is still building i386, and this causes unhappiness
when creating libraries
if [ "%m" = "x86_64" ]; then
perl -pi -e 's|\$\{AFLAGS\}" -DARCH_IS_X86_64"|\$\{AFLAGS\}" -m
amd64 -DARCH_IS_X86_64"|g;' build/generic/configure
fi
# said test doesn't exist anywhere in source -- fangism
sed -i.orig -e '/yv12_to_bgra_altivec_c/,/ERROR/d' examples/xvid_bench.c
<<
###
ConfigureParams: (%m = x86_64) --build=x86_64-apple-darwin (%m = x86_64)
--host=x86_64-apple-darwin
CompileScript: <<
#!/bin/sh -ev
cd ./build/generic
./configure %c
make -w
<<
InfoTest: <<
TestScript: <<
#!/bin/sh -ev
## There is no actual test suite, so TestScript just runs the
examples given
## in examples/README. If they complete successfully, it is
assumed that
## the library is working correctly.
cd %b/examples
make -w
bzip2 -dc cactus.pgm.bz2 | ./xvid_encraw -type 1 || exit 2
bzip2 -d cactus.pgm.bz2 || exit 2
./xvid_encraw -type 1 -i cactus.pgm -save || exit 2
./xvid_encraw -type 1 -i cactus.pgm -o my_xvid_example.m4v
-stats || exit 2
./xvid_decraw -i my_xvid_example.m4v -d || exit 2
cat my_xvid_example.m4v | ./xvid_decraw || exit 2
./xvid_bench || exit 2
<<
<<
InstallScript: <<
#!/bin/sh -ev
cd ./build/generic
make install DESTDIR=%d
mv %i/lib/libxvidcore.4.dylib %i/lib/libxvidcore.4.2.0.dylib
ln -s %p/lib/libxvidcore.4.2.0.dylib %i/lib/libxvidcore.4.dylib
ln -s %p/lib/libxvidcore.4.dylib %i/lib/libxvidcore.dylib
<<
###
DocFiles: AUTHORS ChangeLog ChangeLog-1.0 LICENSE README TODO doc
###
SplitOff: <<
Package: %N-shlibs
DocFiles: LICENSE
Conflicts: xvid-shlibs
Replaces: xvid-shlibs
Files: lib/libxvidcore.*.dylib
Shlibs: %p/lib/libxvidcore.4.dylib 4.0.0 %n (>= 1.1.3-2)
<<
###
Description: XViD Media Codec library
DescDetail: <<
The Xvid video codec implements MPEG-4 Simple Profile and Advanced
Simple Profile standards. It permits compressing and decompressing
digital video in order to reduce the required bandwidth of video
data for transmission over computer networks or efficient storage
on CDs or DVDs. Due to its unrivalled quality Xvid has gained
great popularity and is used in many other GPLed applications,
like e.g. Transcode, MEncoder, MPlayer, Xine and many more.
<<
DescPort: <<
o yasm check in configure modified to understand that versions after 0.8 might
have a 0 in the minor version
o building on x86_64 causes yasm to build as i386, so force x86_64 with "-m
amd64"
<<
###
License: GPL
Maintainer: None <fink-de...@lists.sourceforge.net>
Homepage: http://www.xvid.org/
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
