Skip to content

Commit

Permalink
HD1000 Cascade needs to link with mad and dvbpsi. Generalized buildsc…
Browse files Browse the repository at this point in the history
…ript and the HD1000v module has priority 100 on Roku OS
  • Loading branch information
jpsaman committed Jun 5, 2004
1 parent 6474e0a commit e3dfa45
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 15 deletions.
8 changes: 4 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion modules/video_output/hd1000v.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
25 changes: 15 additions & 10 deletions vlc.roku
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -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

0 comments on commit e3dfa45

Please sign in to comment.