Commit 20881778 authored by Eric Petit's avatar Eric Petit

+ configure.ac: BeOS dvdread linkage fix

 + contrib/src/Makefile: build more libs on BeOS, use libdts' svn
 + Makefile.am: fixed BeOS packages generation
parent 314a3b41
......@@ -406,7 +406,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
if HAVE_BEOS
vlc-bundle: vlc
rm -rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle
rm -Rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle
cp $(srcdir)/vlc $(srcdir)/vlc-bundle/
xres -o $(srcdir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
......@@ -426,7 +426,7 @@ vlc-bundle: vlc
cp "$(srcdir)/po/$$i.gmo" \
"$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
done
find $(srcdir)/vlc-bundle -type f $(srcdir)/vlc-bundle -exec mimeset -f "{}" \;
find $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \;
endif
# Install the modules and the symlinks
......@@ -695,23 +695,21 @@ package-beos:
# Copy relevant files
mkdir -p $(srcdir)/tmp/vlc ;
cd $(srcdir) && \
cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ;
# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
mkdir -p $(srcdir)/tmp/vlc/plugins ; \
find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \
fi
for i in $(ALL_LINGUAS); do \
mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done
cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
THANKS NEWS tmp/vlc/ ;
# Create debug package
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
(cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
# Strip files and create package
# Create normal package
strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
fi
find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \
--strip-debug --strip-unneeded "{}" \; ;
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
......
......@@ -1276,7 +1276,7 @@ then
[ --with-dvdread-tree=PATH libdvdread tree for static linking])
dnl Temporary hack (yeah, sure ;)
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin"; then
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
VLC_ADD_LDFLAGS([dvdread],[-ldvdcss])
fi
......
......@@ -59,7 +59,8 @@ endif
ifeq ($(SYS),BEOS)
all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.FLAC .speex .faad .faac .lame .ffmpeg .dvdcss .dvdread
.FLAC .speex .faad .faac .lame .ffmpeg .dvdcss .dvdread .dvbpsi \
.dts
endif
FORCE:
......@@ -570,7 +571,7 @@ lame: lame-$(LAME_VERSION).tar.gz
$(EXTRACT_GZ)
.lame: lame
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
(cd $<; ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
touch $@
CLEAN_FILE += .lame
......@@ -801,8 +802,13 @@ DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
libdts-$(LIBDTS_VERSION).tar.gz:
$(WGET) $(LIBDTS_URL)
libdts: libdts-$(LIBDTS_VERSION).tar.gz
$(EXTRACT_GZ)
# libdts 0.0.2 doesn't compile on BeOS
#libdts: libdts-$(LIBDTS_VERSION).tar.gz
# $(EXTRACT_GZ)
libdts:
svn co svn://svn.videolan.org/libdts/trunk libdts
(cd $@; ./bootstrap)
.dts: libdts
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
......
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