Skip to content

V
vlc-2-2
Commit 451f3960 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* debian/*.menu: 

    + Removed unused menu files.
  * debian/rules:
    + Build libavformat.
  * include/vlc_common.h:
    + PACKAGE overrides PACKAGE_NAME.
parent 24f83b8b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 19 deletions
debian/Makefile.am
View file @ 451f3960
......@@ -12,16 +12,12 @@ EXTRA_DIST = \
vlc.menu \
gnome-vlc.desktop \
gnome-vlc.dirs \
gnome-vlc.menu \
gvlc.desktop \
gvlc.dirs \
gvlc.menu \
kvlc.dirs \
kvlc.menu \
libvlc0-dev.dirs \
mozilla-plugin-vlc.dirs \
qvlc.dirs \
qvlc.menu \
vlc-plugin-alsa.dirs \
vlc-plugin-arts.dirs \
vlc-plugin-esd.dirs \
......
debian/control
View file @ 451f3960
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, 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.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev
Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, 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.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev, libhal-dev, libtar-dev
Build-Conflicts: libavcodec-dev
Standards-Version: 3.6.1.1
......
debian/gnome-vlc.menu deleted 100644 → 0
View file @ 24f83b8b
?package(gnome-vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/gnome-vlc.xpm" hints="Video"
debian/gvlc.menu deleted 100644 → 0
View file @ 24f83b8b
?package(gvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/gvlc.xpm" hints="Video"
debian/kvlc.menu deleted 100644 → 0
View file @ 24f83b8b
?package(kvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/kvlc.xpm" hints="Video"
debian/qvlc.menu deleted 100644 → 0
View file @ 24f83b8b
?package(qvlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/qvlc.xpm" hints="Video"
debian/rules
View file @ 451f3960
......@@ -100,6 +100,8 @@ configure-stamp:
cd extras/ffmpeg \
&& CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx --disable-altivec \
&& cd libavcodec \
&& $(MAKE) \
&& cd ../libavformat \
&& $(MAKE); \
fi
......@@ -146,6 +148,12 @@ build-stamp: patch configure-stamp
&& rm -f Makefile.pic \
&& sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
&& $(MAKE) -f Makefile.pic \
&& rm -f Makefile.pic \
&& ../libavformat \
&& $(MAKE) clean \
&& rm -f Makefile.pic \
&& sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
&& $(MAKE) -f Makefile.pic \
&& rm -f Makefile.pic; \
fi
......
include/vlc_common.h
View file @ 451f3960
......@@ -38,10 +38,12 @@
#include "config.h"
#if !defined(PACKAGE_NAME)
#if defined(PACKAGE)
# undef PACKAGE_NAME
# define PACKAGE_NAME PACKAGE
#endif
#if !defined(PACKAGE_VERSION)
#if defined(VERSION)
# undef PACKAGE_VERSION
# define PACKAGE_VERSION VERSION
#endif
......
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