Skip to content

V
vlc-gpu
Commit 9bcf04ca authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* debian/control: 

    + Build-depend on a newer wxwindows version to avoid incompatibilities.
    + Build-depend on linux-kernel-headers and build-conflict on dvb-dev
      because these packages cannot be installed together.
  * debian/rules:
    + Temporarily disabled the framebuffer video output plugin because of
       current code errors in linux-kernel-headers.
parent c43fd052
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 12 deletions
debian/changelog
View file @ 9bcf04ca
vlc (0.6.2+cvs20031031-1) unstable; urgency=low vlc (0.6.2+cvs20031030-2) unstable; urgency=low
* debian/control:
+ Build-depend on a newer wxwindows version to avoid incompatibilities.
+ Build-depend on linux-kernel-headers and build-conflict on dvb-dev
because these packages cannot be installed together.
* debian/rules:
+ Temporarily disabled the framebuffer video output plugin because of
current code errors in linux-kernel-headers.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sat, 1 Nov 2003 11:01:40 +0100
vlc (0.6.2+cvs20031030-1) unstable; urgency=low
* New CVS snapshot. * New CVS snapshot.
* debian/rules: * debian/rules:
......
debian/control
View file @ 9bcf04ca
...@@ -2,8 +2,8 @@ Source: vlc ...@@ -2,8 +2,8 @@ Source: vlc
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org> Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev, libspeex-dev Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, linux-kernel-headers (>= 2.5.999-test7-bk-5), libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev, libspeex-dev
Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev, dvb-dev
Standards-Version: 3.6.1.0 Standards-Version: 3.6.1.0
Package: vlc Package: vlc
......
debian/rules
View file @ 9bcf04ca
#!/usr/bin/make -f #!/usr/bin/make -f
# debian/rules for the VideoLAN Client - uses debhelper. # debian/rules for the VideoLAN Client - uses debhelper.
# $Id: rules,v 1.107 2003/10/31 23:57:28 sam Exp $ # $Id: rules,v 1.108 2003/11/01 10:07:09 sam Exp $
# based on Joey Hess's one. # based on Joey Hess's one.
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
...@@ -15,7 +15,7 @@ CONFIG_FLAGS += \ ...@@ -15,7 +15,7 @@ CONFIG_FLAGS += \
--enable-gnome \ --enable-gnome \
--enable-gtk \ --enable-gtk \
--disable-familiar \ --disable-familiar \
--enable-fb \ --disable-fb \
--enable-ggi \ --enable-ggi \
--enable-sdl \ --enable-sdl \
--enable-esd \ --enable-esd \
......
toolbox
View file @ 9bcf04ca
#! /bin/sh #! /bin/sh
## toolbox for the VLC media player ## toolbox for the VLC media player
## $Id: toolbox,v 1.46 2003/10/24 14:50:07 sam Exp $ ## $Id: toolbox,v 1.47 2003/11/01 10:07:08 sam Exp $
## ##
## Authors: Samuel Hocevar <sam@zoy.org> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -136,7 +136,7 @@ fi ...@@ -136,7 +136,7 @@ fi
## ##
if test "${action}" = "vc" if test "${action}" = "vc"
then then
echo "generating Visual Studio files..." echo "generating Visual Studio files"
if test -z "${srcdir}"; then if test -z "${srcdir}"; then
srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`" srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
...@@ -163,7 +163,7 @@ then ...@@ -163,7 +163,7 @@ then
# config files # config files
for target in evc/config.h msvc/config.h for target in evc/config.h msvc/config.h
do do
echo "${target}" printf "."
rm -f ${target} rm -f ${target}
sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \ sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
-e "s/@VERSION@/${LIBVLC_VERSION}/" \ -e "s/@VERSION@/${LIBVLC_VERSION}/" \
...@@ -173,7 +173,7 @@ then ...@@ -173,7 +173,7 @@ then
# libvlc files # libvlc files
for target in evc/libvlc.vcp msvc/libvlc.dsp for target in evc/libvlc.vcp msvc/libvlc.dsp
do do
echo "${target}" printf "."
# Top of the project file # Top of the project file
perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target} perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target}
# The source files # The source files
...@@ -296,7 +296,7 @@ EOF ...@@ -296,7 +296,7 @@ EOF
test "${msdir}" = "evc" && suf="vcp" || suf="dsp" test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
source="${msdir}/plugins.${suf}.in" source="${msdir}/plugins.${suf}.in"
target="${msdir}/plugin_${mod}.${suf}" target="${msdir}/plugin_${mod}.${suf}"
echo "${target}" printf "."
perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} > ${target} perl -pe 'if(/SOURCES/){last;} s/PLUGIN/'${mod}'/g' < ${source} > ${target}
for cfile in ${cfiles} for cfile in ${cfiles}
do do
...@@ -327,7 +327,7 @@ EOF ...@@ -327,7 +327,7 @@ EOF
# vlc files # vlc files
for target in evc/vlc.vcp msvc/vlc.dsp for target in evc/vlc.vcp msvc/vlc.dsp
do do
echo "${target}" printf "."
# Top of the project file # Top of the project file
perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target} perl -pe 'if(/SOURCES/){last;}' < ${target}.in > ${target}
# The source files # The source files
...@@ -349,7 +349,7 @@ EOF ...@@ -349,7 +349,7 @@ EOF
perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target} perl -e 'while(<>){if(/SOURCES/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
done done
echo "done." echo " done."
exit 0 exit 0
fi fi
...@@ -596,12 +596,14 @@ then ...@@ -596,12 +596,14 @@ then
# libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev # libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
# libxosd-dev (>=2.2.4-1.3) with libxosd-dev # libxosd-dev (>=2.2.4-1.3) with libxosd-dev
# ttf-freefonts with ttf-thryomanes # ttf-freefonts with ttf-thryomanes
# linux-kernel-headers (>= 2.5.999-test7-bk-5) with dvb-dev
# remove libwxgtk2.4-dev # remove libwxgtk2.4-dev
# libflac-dev # libflac-dev
# libidl0 (workaround for mozilla-dev's bad deps) # libidl0 (workaround for mozilla-dev's bad deps)
# libglib2.0-0 (workaround for mozilla-dev's bad deps) # libglib2.0-0 (workaround for mozilla-dev's bad deps)
# libmatroska-dev # libmatroska-dev
# libspeex-dev # libspeex-dev
# dvb-dev (in build-conflicts)
# change Source: vlc with Source: vlc-woody # change Source: vlc with Source: vlc-woody
# Section: gnome with Section: graphics # Section: gnome with Section: graphics
# Section: kde with Section: kde # Section: kde with Section: kde
...@@ -616,6 +618,7 @@ then ...@@ -616,6 +618,7 @@ then
-e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \ -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
-e 's/, libxosd-dev[^,]*/, libxosd-dev/' \ -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
-e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \ -e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \
-e 's/, linux-kernel-headers[^,]*/, dvb-dev/' \
-e 's/, libwx[^,]*//' \ -e 's/, libwx[^,]*//' \
-e '/Package: wxvlc/,/^ *$/d' \ -e '/Package: wxvlc/,/^ *$/d' \
-e 's/, libflac-dev[^,]*//' \ -e 's/, libflac-dev[^,]*//' \
...@@ -623,6 +626,7 @@ then ...@@ -623,6 +626,7 @@ then
-e 's/, libglib2.0-0[^,]*//' \ -e 's/, libglib2.0-0[^,]*//' \
-e 's/, libmatroska-dev[^,]*//' \ -e 's/, libmatroska-dev[^,]*//' \
-e 's/, libspeex-dev[^,]*//' \ -e 's/, libspeex-dev[^,]*//' \
-e 's/\(Build-Conflicts: .*\), dvb-dev/\1/' \
-e 's/Source: vlc/Source: vlc-woody/' \ -e 's/Source: vlc/Source: vlc-woody/' \
-e 's/Section: gnome/Section: graphics/' \ -e 's/Section: gnome/Section: graphics/' \
-e 's/Section: kde/Section: graphics/' \ -e 's/Section: kde/Section: graphics/' \
......
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