videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-10-07 03:56:28 +02:00
Code Releases Activity

* extras/contrib/src/Makefile, extras/contrib/src/Patches/goom2k4-0-win32.patch: more cygwin fixes.

Browse Source
This commit is contained in:
Gildas Bazin 2005-11-20 16:54:22 +00:00
parent d0f4573507
commit edaabcaf8d
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/contrib/src/Makefile
View File

@ -1009,7 +1009,7 @@ endif
ifdef HAVE_DARWIN_OS
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
else
(cd $<&& autoconf configure.in >|configure && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
(cd $< && rm -f configure; autoconf configure.in > configure && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
endif
touch $@

62
extras/contrib/src/Patches/goom2k4-0-win32.patch
View File

@ -2,38 +2,38 @@ diff -Naur goom-orig/configure.in goom/configure.in
--- goom-orig/configure.in 2005-02-07 14:46:41.000000000 +0100
+++ goom/configure.in 2005-08-26 16:37:03.000000000 +0200
@@ -1,6 +1,5 @@
AC_INIT(README)
-AM_DISABLE_STATIC
AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
ACLOCAL="$ACLOCAL -I m4"
AC_INIT(README)
-AM_DISABLE_STATIC
AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
ACLOCAL="$ACLOCAL -I m4"
@@ -76,24 +75,7 @@
AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
-AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
-
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
-fi
-
-AC_SUBST(PTHREAD_LIBS)
+dnl AC_SUBST(PTHREAD_LIBS)
dnl rm -f mmx_zoom.s
dnl echo -n checking for nasm...
AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
-AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
-
-PTHREAD_LIBS=error
-AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
-fi
-
-if test "x$PTHREAD_LIBS" = xerror; then
- AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
-fi
-
-AC_SUBST(PTHREAD_LIBS)
+dnl AC_SUBST(PTHREAD_LIBS)
dnl rm -f mmx_zoom.s
dnl echo -n checking for nasm...
diff -Naur goom-orig/src/filters.c goom/src/filters.c
--- goom-orig/src/filters.c 2005-02-07 14:46:41.000000000 +0100
+++ goom/src/filters.c 2005-08-26 16:31:17.000000000 +0200