Commit fd9eb658 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: remove unneeded patch

parent 00d1ebdf
--- configure 2008-04-06 09:07:25.000000000 +0200
+++ configure 2008-04-06 09:10:52.000000000 +0200
@@ -516,6 +516,7 @@
# autodetect options that weren't forced nor disabled
libpthread=""
+extradef=""
if test "$pthread" = "auto" ; then
pthread="no"
case $SYS in
@@ -523,13 +524,13 @@
pthread="yes"
;;
MINGW)
- if cc_check pthread.h -lpthread "pthread_create(0,0,0,0);" ; then
+ if cc_check pthread.h -lpthread "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
pthread="yes"
libpthread="-lpthread"
- elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0);" ; then
+ elif cc_check pthread.h -lpthreadGC2 "pthread_create(0,0,0,0); pthread_num_processors_np(); " ; then
pthread="yes"
libpthread="-lpthreadGC2"
- elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0);" ; then
+ elif cc_check pthread.h "-lpthreadGC2 -lwsock32 -DPTW32_STATIC_LIB" "pthread_create(0,0,0,0); pthread_num_processors_np();" ; then
pthread="yes"
libpthread="-lpthreadGC2 -lwsock32"
define PTW32_STATIC_LIB
@@ -807,7 +808,7 @@
Description: H.264 (MPEG4 AVC) encoder library
Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
Libs: $pclibs
-Cflags: -I$includedir
+Cflags: -I$includedir $extradef
EOF
filters="crop select_every"
......@@ -1448,9 +1448,6 @@ x264-$(X264_VERSION).tar.gz:
ifdef GIT
x264:
$(GIT) clone git://git.videolan.org/x264.git
ifdef HAVE_WIN32
(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
endif
ifdef HAVE_WIN64
(cd x264; patch -p0 < ../Patches/x264-svn-win64.patch )
endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment