From: Jean-Paul Saman <jpsaman@videolan.org>
Date: Sat, 5 Jun 2004 19:27:48 +0000 (+0000)
Subject: HD1000 Cascade needs to link with mad and dvbpsi. Generalized buildscript and the... 
X-Git-Tag: 0.8.0~1217
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e3dfa451490c532186db75d8e0beb50374ec34fe;p=vlc

HD1000 Cascade needs to link with mad and dvbpsi. Generalized buildscript and the HD1000v module has priority 100 on Roku OS
---

diff --git a/configure.ac b/configure.ac
index ad6787386a..ca6b7d0f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2400,7 +2400,7 @@ AC_CHECK_HEADERS(png.h, [
     AX_ADD_LDFLAGS([logo],[-lpng -lz])
     AX_ADD_PLUGINS([logo])
     AX_ADD_LDFLAGS([svcdsub],[-lpng -lz])
-    AX_ADD_LDFLAGS([cvdsub],[-lpng -lz])
+    AX_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm])
     AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])])
 
 dnl
@@ -2681,7 +2681,7 @@ dnl
 dnl Roku HD1000 Video output module
 dnl
 AC_ARG_ENABLE(hd1000v,
-  [  --enable-hd1000v        HD1000 Video Output module (default enabled on HD1 000)])
+  [  --enable-hd1000v        HD1000 Video Output module (default enabled on HD1000)])
 if test "${enable_hd1000v}" != "no" &&
   (test "${SYS}" != "mingw32" || test "${enable_hd1000v}" = "yes")
 then
@@ -2697,7 +2697,7 @@ then
   if test "$can_build_roku" = "yes"
   then
     AX_ADD_PLUGINS([hd1000v])
-    AX_ADD_LDFLAGS([hd1000v],[-lCascade])
+    AX_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad])
   fi
   AC_LANG_POP([C++])
 fi
@@ -3160,7 +3160,7 @@ dnl
 dnl  PDA Gtk+2 module
 dnl
 AC_ARG_ENABLE(pda,
-  [  --enable-pda          PDA interface needs Gtk2 support (default disabled)])
+  [  --enable-pda            PDA interface needs Gtk2 support (default disabled)])
 if test "x${enable_pda}" = "xyes"
 then
   PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
diff --git a/modules/video_output/hd1000v.cpp b/modules/video_output/hd1000v.cpp
index b37f2c1043..04c094da21 100644
--- a/modules/video_output/hd1000v.cpp
+++ b/modules/video_output/hd1000v.cpp
@@ -55,7 +55,7 @@ static void FreePicture( vout_thread_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("HD1000 video output") );
-    set_capability( "video output", 10 );
+    set_capability( "video output", 100 );
     add_shortcut( "hd1000v" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
diff --git a/vlc.roku b/vlc.roku
index 6fc8ba10d1..5ad36aa4b2 100755
--- a/vlc.roku
+++ b/vlc.roku
@@ -1,13 +1,17 @@
 #!/bin/sh
+
+SRC="${HOME}/src"
+
+# do it.
 make distclean
 ./bootstrap
 CC=mipsel-linux-gcc CXX=mipsel-linux-g++ AR=mipsel-linux-ar LD=mipsel-linux-ld RANLIB=mipsel-linux-ranlib STRIP=mipsel-linux-strip \
- ./configure --host=mipsel --enable-release --enable-static --disable-shared --disable-plugins \
-  --prefix=/home/jpsaman/src/roku-dev/usr \
+ ./configure --host=mipsel --enable-release --enable-static --enable-shared --enable-plugins \
+  --prefix=${HOME}/src/roku-dev/usr \
   --disable-sdl \
-  --enable-mad --with-mad-tree=/home/jpsaman/src/libmad-0.15.0b \
-  --enable-libmpeg2 --with-libmpeg2-tree=/home/jpsaman/src/mpeg2dec-0.4.0 \
-  --enable-dvbpsi --with-dvbpsi-tree=/home/jpsaman/src/libdvbpsi3-0.1.4 \
+  --enable-mad \
+  --disable-libmpeg2 --with-libmpeg2-tree=${SRC}/mpeg2dec-0.4.0 \
+  --disable-dvbpsi --with-dvbpsi-tree=${SRC}/libdvbpsi3-0.1.4 \
   --disable-vcd --disable-vcdx --disable-cdda --disable-cddax --disable-libcdio --disable-libcddb \
   --disable-dvd --disable-dvdread --disable-dvdnav --disable-dvdplay \
   --disable-dshow --disable-directx --disable-wingdi --disable-waveout \
@@ -45,9 +49,10 @@ CC=mipsel-linux-gcc CXX=mipsel-linux-g++ AR=mipsel-linux-ar LD=mipsel-linux-ld R
   --disable-fribidi --disable-freetype \
   --disable-sout \
   --enable-oss --disable-alsa \
-  --enable-visual --disable-goom \
-  --enable-hd1000a --enable-hd1000v \
-  CFLAGS="-I/home/jpsaman/src/roku-dev/usr/include -I/home/jpsaman/src/roku-dev/usr/local/include/roku" \
-  CXXFLAGS="-I/usr/tools/roku/include " \
-  LDFLAGS="-L/usr/tools/roku/mipsel-linux/lib -L/home/jpsaman/src/roku-dev/lib -L/home/jpsaman/src/roku-dev/usr/local/lib -Wl,-rpath-link -Wl,/home/jpsaman/src/roku-dev/usr/local/lib" && \
+  --disable-visual --disable-goom \
+  --enable-hd1000a --disable-hd1000v \
+  CFLAGS="-I${HOME}/src/roku-dev/usr/include -I${HOME}/src/roku-dev/usr/local/include/roku" \
+  CXXFLAGS="-I/usr/tools/roku/include" \
+  CPPFLAGS="-I${HOME}/src/roku-dev/usr/local/include" \
+  LDFLAGS="-L/usr/tools/roku/mipsel-linux/lib -L${HOME}/src/roku-dev/lib -L${HOME}/src/roku-dev/usr/local/lib -Wl,-rpath-link -Wl,${HOME}/src/roku-dev/usr/local/lib -lm" && \
   make