From: Sam Hocevar Date: Mon, 4 Nov 2002 15:04:45 +0000 (+0000) Subject: * ./Makefile.am: we properly install plugins in the OS X vlc.app directory. X-Git-Tag: 0.5.0~777 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=141414b0c4784637a704aafebc04f253c0354671;p=vlc * ./Makefile.am: we properly install plugins in the OS X vlc.app directory. * ./mozilla/npvlc_rc.rc, ./mozilla/vlcplugin.h: added the Ogg mime type to the Mozilla plugin properties. * ./debian/control: added libogg-dev and libvorbis-dev dependicies to the Debian build script. --- diff --git a/Makefile.am b/Makefile.am index a813154e14..9525060295 100644 --- a/Makefile.am +++ b/Makefile.am @@ -155,6 +155,7 @@ HEADERS_include = \ include/beos_specific.h \ include/configuration.h \ include/darwin_specific.h \ + include/codecs.h \ include/error.h \ include/input_ext-dec.h \ include/input_ext-intf.h \ @@ -392,14 +393,17 @@ if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = vlc.app vlc_appdir = $(bindir) -vlc.app: vlc +vlc.app: vlc $(PLUGIN_FILES) rm -Rf vlc.app cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$" cp -r extras/MacOSX/build/vlc.bundle ./vlc.app - $(INSTALL) -d vlc.app/Contents/MacOS/share - $(INSTALL) -d vlc.app/Contents/MacOS/modules + $(INSTALL) -d vlc.app/Contents/MacOS $(INSTALL) vlc vlc.app/Contents/MacOS/ -# FIXME: install modules ! (and add dependency on modules) + $(INSTALL) -d vlc.app/Contents/MacOS/modules + for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ + $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \ + fi ; done + $(INSTALL) -d vlc.app/Contents/MacOS/share $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share endif @@ -494,6 +498,9 @@ endif ############################################################################### # Modules ############################################################################### +MOSTLYCLEANFILES += $(PLUGIN_FILES) +PLUGIN_FILES = + libvlcdir = $(libdir)/vlc include Modules.am diff --git a/bootstrap b/bootstrap index fa85b8b46e..f40afcad4e 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh ## bootstrap file for vlc, the VideoLAN Client -## $Id: bootstrap,v 1.21 2002/10/29 18:12:07 sam Exp $ +## $Id: bootstrap,v 1.22 2002/11/04 15:04:44 sam Exp $ ## ## Authors: Samuel Hocevar @@ -126,6 +126,7 @@ L_builtin += \$(L_${mod}_b) L_builtin_pic += \$(L_${mod}_pic) LDFLAGS_builtin += \$(F_${mod}_b) ${PRIVATE}BUILT_SOURCES += \$(B_${mod}_p) \$(B_${mod}_b) +PLUGIN_FILES += \$(D_${mod}_p) ${PRIVATE}${sym}_lib${mod}_plugin_a_SOURCES = \$(SOURCES_${mod}) ${NODIST}${PRIVATE}nodist_${sym}_lib${mod}_plugin_a_SOURCES = \$(nodist_SOURCES_${mod}) @@ -152,7 +153,6 @@ libvlc_LIBRARIES += \$(L_${mod}_b) \$(L_${mod}_pic) lib${mod}_DATA = \$(D_${mod}_p) lib${mod}dir = \$(libdir)/vlc/${topdir} -MOSTLYCLEANFILES += \$(D_${mod}_p) ${PRIVATE}noinst_LIBRARIES += \$(L_${mod}_p) ${PRIVATE}${dir}/lib${mod}_plugin\$(LIBEXT): \$(${sym}_lib${mod}_plugin_a_OBJECTS) ${PRIVATE} \$(${LINKER}) \$^ -shared \$(LDFLAGS_plugins) \$(LDFLAGS_${mod}) @@ -171,7 +171,7 @@ echo "done." ### classic bootstrap stuff ### set -x -rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh +rm -f aclocal.m4 m4/oldgettext.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh rm -Rf intl # Check for gettext diff --git a/debian/control b/debian/control index f4fa79481d..122ffcdaf8 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vlc Section: graphics Priority: optional Maintainer: Samuel Hocevar -Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev (>=1.0.2-1), svgalibg1-dev (>=1.4.0) +Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev (>=1.0.2-1), svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev Standards-Version: 3.5.6 Package: vlc @@ -316,3 +316,13 @@ Description: DVB input plugin for vlc . This plugin adds support for DVB cards to vlc, the VideoLAN Client. Note that your card needs to be supported by your kernel before vlc can use it. + +Package: vlc-plugin-ogg +Architecture: any +Depends: vlc (= ${Source-Version}), ${shlibs:Depends} +Description: Ogg demuxer and Vorbis codec plugins for vlc + VideoLAN is a free MPEG, MPEG2, DVD and DivX software solution. + . + These plugins add support for the Ogg bitstream format and the Ogg Vorbis + compressed audio format to vlc, the VideoLAN Client. They are autodetected. + diff --git a/debian/rules b/debian/rules index 01b63bd0cc..e6ffb884b2 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ export DH_COMPAT=3 # CONFIG_FLAGS = --enable-release --prefix=/usr -CONFIG_FLAGS += --enable-gnome --enable-gtk --enable-familiar --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-mp4 --enable-dvb --enable-dv --enable-svgalib --enable-satellite +CONFIG_FLAGS += --enable-gnome --enable-gtk --enable-familiar --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-mp4 --enable-dvb --enable-dv --enable-svgalib --enable-satellite --enable-ogg --enable-vorbis CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad ifeq ($(DEB_BUILD_ARCH),i386) @@ -212,6 +212,13 @@ endif mv debian/vlc/usr/lib/vlc/access/libsatellite_plugin.so \ debian/vlc-plugin-dvb/usr/lib/vlc/access + # Package: vlc-plugin-ogg + ln -s vlc debian/vlc-plugin-ogg/usr/share/doc/vlc-plugin-ogg + mv debian/vlc/usr/lib/vlc/demux/libogg_plugin.so \ + debian/vlc-plugin-ogg/usr/lib/vlc/demux + mv debian/vlc/usr/lib/vlc/codec/libvorbis_plugin.so \ + debian/vlc-plugin-ogg/usr/lib/vlc/codec + # Clean up rm -f debian/vlc/$(VIDDIR)/*.png diff --git a/doc/fortunes.txt b/doc/fortunes.txt index 07790ade31..82d0feb45b 100644 --- a/doc/fortunes.txt +++ b/doc/fortunes.txt @@ -342,3 +342,15 @@ the Boston strangler is to the woman home alone. -- #videolan % + Meuuh: rahh, p'in, t'as raison + je suis une merde... + axiome de videolan : j'ai *toujours* raison + + -- #videolan +% + ooooh + that's a pretty good idea + yeah, that's mine :) + + -- #videolan +% diff --git a/mozilla/npvlc_rc.rc b/mozilla/npvlc_rc.rc index 4482dbbc5e..52dad039af 100644 --- a/mozilla/npvlc_rc.rc +++ b/mozilla/npvlc_rc.rc @@ -31,9 +31,9 @@ BEGIN VALUE "InternalName", "npvlc\0" VALUE "CompanyName", "VideoLAN\0" VALUE "LegalCopyright", "Copyright VideoLAN \251 1996-2002\0" - VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|application/x-vlc-plugin\0" - VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|\0" - VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|VLC plugin\0" + VALUE "MIMEType", "audio/mpeg|audio/x-mpeg|video/mpeg|video/x-mpeg|video/mpeg-system|video/x-mpeg-system|video/mpeg4|audio/mpeg4|application/mpeg4-iod|application/mpeg4-muxcodetable|video/x-msvideo|video/quicktime|applicateion/x-ogg|application/x-vlc-plugin\0" + VALUE "FileExtents", "mp2,mp3,mpga,mpega|mp2,mp3,mpga,mpega|mpg,mpeg,mpe|mpg,mpeg,mpe|mpg,mpeg,vob|mpg,mpeg,vob|mp4,mpg4|mp4,mpg4|mp4,mpg4|mp4,mpg4|avi|mov,qt|ogg|\0" + VALUE "FileOpenName", "MPEG audio|MPEG audio|MPEG video|MPEG video|MPEG video|MPEG video|MPEG-4 video|MPEG-4 audio|MPEG-4 video|MPEG-4 video|AVI video|QuickTime video|Ogg stream|VLC plugin\0" END END BLOCK "VarFileInfo" diff --git a/mozilla/vlcplugin.h b/mozilla/vlcplugin.h index e98292c069..c5c35ed380 100644 --- a/mozilla/vlcplugin.h +++ b/mozilla/vlcplugin.h @@ -2,7 +2,7 @@ * vlcplugin.h: a VideoLAN plugin for Mozilla ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: vlcplugin.h,v 1.7 2002/10/25 18:17:59 sam Exp $ + * $Id: vlcplugin.h,v 1.8 2002/11/04 15:04:44 sam Exp $ * * Authors: Samuel Hocevar * @@ -91,6 +91,8 @@ private: "video/x-msvideo:avi:AVI video;" \ /* QuickTime */ \ "video/quicktime:mov,qt:QuickTime video;" \ + /* Ogg */ \ + "application/x-ogg:ogg:Ogg stream;" \ /* explicit plugin call */ \ "application/x-vlc-plugin::VLC plugin"