mirror of
https://github.com/videolan/vlc.git
synced 2025-01-26 09:36:25 +08:00
* debian/*.menu:
+ Removed unused menu files. * debian/rules: + Build libavformat. * include/vlc_common.h: + PACKAGE overrides PACKAGE_NAME.
This commit is contained in:
parent
24f83b8b4f
commit
451f396085
4
debian/Makefile.am
vendored
4
debian/Makefile.am
vendored
@ -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 \
|
||||
|
2
debian/control
vendored
2
debian/control
vendored
@ -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
|
||||
|
||||
|
3
debian/gnome-vlc.menu
vendored
3
debian/gnome-vlc.menu
vendored
@ -1,3 +0,0 @@
|
||||
?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"
|
3
debian/gvlc.menu
vendored
3
debian/gvlc.menu
vendored
@ -1,3 +0,0 @@
|
||||
?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"
|
3
debian/kvlc.menu
vendored
3
debian/kvlc.menu
vendored
@ -1,3 +0,0 @@
|
||||
?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"
|
3
debian/qvlc.menu
vendored
3
debian/qvlc.menu
vendored
@ -1,3 +0,0 @@
|
||||
?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"
|
8
debian/rules
vendored
8
debian/rules
vendored
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user