Commit c4b4857b authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed build dependencies for architectures not supporting libasound2
    (Closes Debian bug #109722).
parent 4febe3a2
...@@ -211,6 +211,7 @@ snapshot-common: ...@@ -211,6 +211,7 @@ snapshot-common:
find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \ find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
do mkdir -p tmp/vlc/$$i ; \ do mkdir -p tmp/vlc/$$i ; \
done done
rm -Rf tmp/vlc/tmp
find debian -mindepth 1 -maxdepth 1 -type d | \ find debian -mindepth 1 -maxdepth 1 -type d | \
while read i ; do rm -Rf tmp/vlc/$$i ; done while read i ; do rm -Rf tmp/vlc/$$i ; done
# Copy .c .h .in .cpp and .glade files # Copy .c .h .in .cpp and .glade files
......
vlc (0.2.83-2) unstable; urgency=low
* Fixed build dependencies for architectures not supporting libasound2
(Closes: #109722).
-- Samuel Hocevar <sam@zoy.org> Fri, 24 Aug 2001 12:47:45 +0200
vlc (0.2.83-1) unstable; urgency=low vlc (0.2.83-1) unstable; urgency=low
* New upstream release. * New upstream release.
......
...@@ -2,7 +2,7 @@ Source: vlc ...@@ -2,7 +2,7 @@ Source: vlc
Section: graphics Section: graphics
Priority: optional Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org> Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev Build-Depends: debhelper (>=2.2.0), xlibs-dev, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev, libqt-dev, libasound2-dev [alpha|i386|ia64|m68k|powerpc]
Standards-Version: 3.0.1 Standards-Version: 3.0.1
Package: vlc Package: vlc
...@@ -66,7 +66,7 @@ Description: Esound plugin for vlc ...@@ -66,7 +66,7 @@ Description: Esound plugin for vlc
vlc, the VideoLAN Client. vlc, the VideoLAN Client.
Package: vlc-alsa Package: vlc-alsa
Architecture: any Architecture: alpha i386 ia64 m68k powerpc
Depends: vlc (= ${Source-Version}), ${shlibs:Depends} Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
Description: ALSA plugin for vlc Description: ALSA plugin for vlc
VideoLAN is a free MPEG, MPEG2 and DVD software solution. VideoLAN is a free MPEG, MPEG2 and DVD software solution.
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
export DH_COMPAT=3 export DH_COMPAT=3
# Compilation options # Compilation options
export CONFIG_FLAGS="--prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-alsa --enable-qt" export CONFIG_FLAGS="--prefix=/usr --enable-gnome --enable-gtk --enable-fb --with-ggi --with-sdl --enable-esd --enable-qt"
export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared" export LIBDVDCSS_FLAGS="--with-dvdcss=local-shared"
export VIDDIR="usr/share/videolan" export VIDDIR="usr/share/videolan"
export PIXDIR="usr/share/pixmaps" export PIXDIR="usr/share/pixmaps"
...@@ -23,18 +23,17 @@ build: build-stamp ...@@ -23,18 +23,17 @@ build: build-stamp
build-stamp: build-stamp:
dh_testdir dh_testdir
if [ $(DEB_BUILD_ARCH) = i386 ]; then \ case $(DEB_BUILD_ARCH) in \
./configure --mandir=$${prefix}/share/man \ i386) \
--infodir=$${prefix}/share/info \ ARCH_FLAGS="--enable-alsa --with-glide --disable-ppro" ;; \
$(shell echo $(CONFIG_FLAGS)) \ alpha|ia64|m68k|powerpc) \
$(shell echo $(LIBDVDCSS_FLAGS)) \ ARCH_FLAGS="--enable-alsa" ;; \
--with-glide --disable-ppro ; \ *) \
else \ ARCH_FLAGS="" ;; \
./configure --mandir=$${prefix}/share/man \ esac ;\
--infodir=$${prefix}/share/info \ ./configure $$ARCH_FLAGS --mandir=$${prefix}/share/man \
$(shell echo $(CONFIG_FLAGS)) \ --infodir=$${prefix}/share/info \
$(shell echo $(LIBDVDCSS_FLAGS)) ; \ $(shell echo $(CONFIG_FLAGS)) $(shell echo $(LIBDVDCSS_FLAGS))
fi
$(MAKE) $(MAKE)
...@@ -58,7 +57,15 @@ install: build ...@@ -58,7 +57,15 @@ install: build
DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
# make symlinks for packages and install plugins # make symlinks for packages and install plugins
for alias in ggi gtk gnome esd sdl qt alsa `if [ $(DEB_BUILD_ARCH) = i386 ]; then echo glide ; fi` ; do \ case $(DEB_BUILD_ARCH) in \
i386) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa glide" ;; \
alpha|ia64|m68k|powerpc) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt alsa" ;; \
*) \
ARCH_ALIASES="ggi gtk gnome esd sdl qt" ;; \
esac ;\
for alias in $$ARCH_ALIASES ; do \
ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \ ln -s vlc debian/vlc-$$alias/usr/share/doc/vlc-$$alias ; \
mv debian/vlc/usr/lib/videolan/vlc/$$alias.so \ mv debian/vlc/usr/lib/videolan/vlc/$$alias.so \
debian/vlc-$$alias/usr/lib/videolan/vlc/ ; done debian/vlc-$$alias/usr/lib/videolan/vlc/ ; done
...@@ -112,7 +119,6 @@ binary-arch: build install ...@@ -112,7 +119,6 @@ binary-arch: build install
# dh_installpam # dh_installpam
# dh_installinit # dh_installinit
# dh_installcron # dh_installcron
# dh_installmanpages -Nvlc-gnome -Nvlc-gtk -Nvlc-ggi -Nvlc-glide -Nvlc-esd -Nvlc-alsa -Nvlc-sdl -Nvlc-qt doc/vlc.1
dh_installman doc/vlc.1 dh_installman doc/vlc.1
# dh_installinfo # dh_installinfo
# dh_undocumented # dh_undocumented
...@@ -127,16 +133,19 @@ binary-arch: build install ...@@ -127,16 +133,19 @@ binary-arch: build install
dh_makeshlibs dh_makeshlibs
dh_installdeb dh_installdeb
# dh_perl # dh_perl
dh_shlibdeps -Nvlc-glide
if [ $(DEB_BUILD_ARCH) = i386 ]; then \ case $(DEB_BUILD_ARCH) in \
dh_gencontrol ;\ i386) \
dh_md5sums ;\ ARCH_EXCLUDE="" ;; \
dh_builddeb ;\ alpha|ia64|m68k|powerpc) \
else \ ARCH_EXCLUDE="-Nvlc-glide" ;; \
dh_gencontrol -Nvlc-glide ;\ *) \
dh_md5sums -Nvlc-glide ;\ ARCH_EXCLUDE="-Nvlc-glide -Nvlc-alsa" ;; \
dh_builddeb -Nvlc-glide ;\ esac ;\
fi dh_shlibdeps $$ARCH_EXCLUDE ;\
dh_gencontrol $$ARCH_EXCLUDE ;\
dh_md5sums $$ARCH_EXCLUDE ;\
dh_builddeb $$ARCH_EXCLUDE
binary: binary-indep binary-arch binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install .PHONY: build clean binary-indep binary-arch binary 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