A few problems with 0.2.73
Arnaud Gomes-do-Vale
arnaud at carrosse.frmug.org
Tue May 1 02:33:59 CEST 2001
Arnaud Gomes-do-Vale <arnaud at carrosse.frmug.org> writes:
> I have had a hard time compiling vlc 0.2.73 on my system (mostly Red
> Hat 7.1, XFree86 4.0.3 from a recent Conectiva snapshot). Some of the
> problems I ran into:
Here is the patch against the latest CVS. It is untested, but it
should work.
Common subdirectories: vlc/CVS and vlc.new/CVS
diff -u vlc/Makefile.opts.in vlc.new/Makefile.opts.in
--- vlc/Makefile.opts.in Mon Apr 30 11:44:26 2001
+++ vlc.new/Makefile.opts.in Tue May 1 01:40:43 2001
@@ -45,6 +45,7 @@
CFLAGS = @CFLAGS@
SHELL = @SHELL@
RANLIB = @RANLIB@
+MOC = @MOC@
#
# Installation environment
diff -u vlc/configure vlc.new/configure
--- vlc/configure Tue May 1 01:41:19 2001
+++ vlc.new/configure Tue May 1 02:22:27 2001
@@ -3614,6 +3614,12 @@
PLUGINS="${PLUGINS} qt"
ALIASES="${ALIASES} qvlc"
LIB_QT="-lqt -L${QTDIR}/lib"
+ if test -x ${QTDIR}/bin/moc ;
+ then
+ MOC=${QTDIR}/bin/moc
+ else
+ MOC=moc
+ fi
fi
fi
@@ -3646,7 +3652,7 @@
# Extract the first word of "gtk-config", so it can be a program name with args.
set dummy gtk-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3650: checking for $ac_word" >&5
+echo "configure:3656: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3706,17 +3712,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3710: checking for $ac_hdr" >&5
+echo "configure:3716: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3721 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3768,17 +3774,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3772: checking for $ac_hdr" >&5
+echo "configure:3778: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3777 "configure"
+#line 3783 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3800,8 +3806,44 @@
EOF
PLUGINS="${PLUGINS} xvideo"
- LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
+ LIB_XVIDEO="-L$x_libraries -lX11 -lXext"
CFLAGS_X11="-I$x_includes"
+ echo $ac_n "checking for main in -lXv""... $ac_c" 1>&6
+echo "configure:3813: checking for main in -lXv" >&5
+ac_lib_var=`echo Xv'_'main | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lXv $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3821 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIB_XVIDEO="${LIB_XVIDEO} -lXv"
+else
+ echo "$ac_t""no" 1>&6
+fi
+
CPPFLAGS=$saved_CPPFLAGS
else
@@ -3816,17 +3858,17 @@
enableval="$enable_alsa"
if test x$enable_alsa = xyes; then ac_safe=`echo "sys/asoundlib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/asoundlib.h""... $ac_c" 1>&6
-echo "configure:3820: checking for sys/asoundlib.h" >&5
+echo "configure:3862: checking for sys/asoundlib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3825 "configure"
+#line 3867 "configure"
#include "confdefs.h"
#include <sys/asoundlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3843,7 +3885,7 @@
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-echo "configure:3847: checking for main in -lasound" >&5
+echo "configure:3889: checking for main in -lasound" >&5
ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3851,14 +3893,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lasound $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3855 "configure"
+#line 3897 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3930,6 +3972,7 @@
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -4092,6 +4135,7 @@
s%@TRACE@%$TRACE%g
s%@OPTIMS@%$OPTIMS%g
s%@CSS@%$CSS%g
+s%@MOC@%$MOC%g
s%@LCFLAGS@%$LCFLAGS%g
s%@LIB@%$LIB%g
s%@LIB_ALSA@%$LIB_ALSA%g
diff -u vlc/configure.in vlc.new/configure.in
--- vlc/configure.in Sat Apr 28 07:08:01 2001
+++ vlc.new/configure.in Tue May 1 02:21:56 2001
@@ -392,6 +392,12 @@
PLUGINS="${PLUGINS} qt"
ALIASES="${ALIASES} qvlc"
LIB_QT="-lqt -L${QTDIR}/lib"
+ if test -x ${QTDIR}/bin/moc ;
+ then
+ MOC=${QTDIR}/bin/moc
+ else
+ MOC=moc
+ fi
fi])
dnl
@@ -465,8 +471,9 @@
CPPFLAGS="$CPPFLAGS -I$x_includes"
AC_CHECK_HEADERS(X11/extensions/Xv.h, [
PLUGINS="${PLUGINS} xvideo"
- LIB_XVIDEO="-L$x_libraries -lX11 -lXext -lXv"
+ LIB_XVIDEO="-L$x_libraries -lX11 -lXext"
CFLAGS_X11="-I$x_includes"
+ AC_CHECK_LIB(Xv, main, LIB_XVIDEO="${LIB_XVIDEO} -lXv")
]
CPPFLAGS=$saved_CPPFLAGS)
fi
@@ -499,6 +506,7 @@
AC_SUBST(TRACE)
AC_SUBST(OPTIMS)
AC_SUBST(CSS)
+AC_SUBST(MOC)
AC_SUBST(LCFLAGS)
AC_SUBST(LIB)
Common subdirectories: vlc/debian and vlc.new/debian
Common subdirectories: vlc/doc and vlc.new/doc
Common subdirectories: vlc/extras and vlc.new/extras
Common subdirectories: vlc/include and vlc.new/include
Common subdirectories: vlc/lib and vlc.new/lib
Common subdirectories: vlc/plugins and vlc.new/plugins
Common subdirectories: vlc/share and vlc.new/share
Common subdirectories: vlc/src and vlc.new/src
diff -u vlc/vlc.spec vlc.new/vlc.spec
--- vlc/vlc.spec Sat Apr 28 07:08:01 2001
+++ vlc.new/vlc.spec Tue May 1 02:29:09 2001
@@ -47,7 +47,12 @@
%build
./configure --prefix=/usr --with-sdl --enable-esd --enable-gnome --enable-qt
-make
+if [ -x /usr/bin/kgcc ] ;
+then
+ CC=/usr/bin/kgcc make
+else
+ make
+fi
%install
mkdir -p $RPM_BUILD_ROOT/usr/lib
mkdir -p $RPM_BUILD_ROOT/usr/bin
--
Arnaud
More information about the vlc
mailing list