mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-07 03:56:28 +02:00
* ./debian/rules: we now build the static objects twice: once the normal
way before we link them with VLC, and once with -fPIC so that they can be linked to the Mozilla plugin. Don't worry, it's Debian-specific, and we don't need it on x86.
This commit is contained in:
parent
9447bce6d6
commit
197edbfffa
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,8 +1,12 @@
|
||||
vlc (0.5.3-2) unstable; urgency=low
|
||||
|
||||
* Changed the libvlc0-dev section to libdevel.
|
||||
* We now build the static objects twice: once the normal way before we
|
||||
link them with VLC, and once with -fPIC so that they can be linked to
|
||||
the Mozilla plugin.
|
||||
* Updated extras/faad/config.{sub,guess}.
|
||||
|
||||
-- Samuel Hocevar <sam@zoy.org> Fri, 11 Apr 2003 21:14:07 +0200
|
||||
-- Samuel Hocevar <sam@zoy.org> Fri, 14 Apr 2003 15:14:07 +0200
|
||||
|
||||
vlc (0.5.3-1) unstable; urgency=low
|
||||
|
||||
|
6
debian/control
vendored
6
debian/control
vendored
@ -36,7 +36,7 @@ Conflicts: vlc-gnome (<< 0.5.0)
|
||||
Replaces: vlc-gnome (<< 0.5.0)
|
||||
Provides: vlc-gui
|
||||
Description: GNOME frontend for VLC
|
||||
This plugin adds a Gnome interface to the VLC media player. To activate
|
||||
This plugin adds a GNOME interface to the VLC media player. To activate
|
||||
it, use the `--intf gnome' flag or run the `gnome-vlc' program.
|
||||
|
||||
Package: vlc-gnome
|
||||
@ -52,8 +52,8 @@ Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
|
||||
Conflicts: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
|
||||
Replaces: vlc-gnome (<= 0.2.63-2), vlc-gtk (<< 0.5.0)
|
||||
Provides: vlc-gui
|
||||
Description: Gtk+ frontend for VLC
|
||||
This plugin adds a Gtk+ interface to the VLC media player. To activate
|
||||
Description: GTK+ frontend for VLC
|
||||
This plugin adds a GTK+ interface to the VLC media player. To activate
|
||||
it, use the `--intf gtk' flag or run the `gvlc' program.
|
||||
|
||||
Package: vlc-gtk
|
||||
|
34
debian/rules
vendored
34
debian/rules
vendored
@ -87,7 +87,7 @@ build-stamp:
|
||||
cd extras/ffmpeg \
|
||||
&& ./configure \
|
||||
&& cd libavcodec \
|
||||
&& make; \
|
||||
&& $(MAKE); \
|
||||
fi
|
||||
|
||||
# Check that we have an faad tree in here (can be a symlink)
|
||||
@ -101,12 +101,36 @@ build-stamp:
|
||||
&& touch `find . -name Makefile.in` \
|
||||
&& ./configure --disable-shared \
|
||||
&& cd libfaad \
|
||||
&& make; \
|
||||
&& $(MAKE); \
|
||||
fi
|
||||
|
||||
# Configure VLC and build it
|
||||
# Configure VLC
|
||||
./configure --mandir=$${prefix}/share/man \
|
||||
--infodir=$${prefix}/share/info $(CONFIG_FLAGS)
|
||||
|
||||
# Build only VLC, with the non-PIC libs
|
||||
$(MAKE) vlc
|
||||
|
||||
ifneq ($(DEB_BUILD_ARCH),i386)
|
||||
# Hackety hackety hack
|
||||
if test ! -d CVS; then \
|
||||
cd extras/ffmpeg/libavcodec \
|
||||
&& $(MAKE) clean \
|
||||
&& rm -f Makefile.pic \
|
||||
&& sed 's/^CFLAGS *=/&-fPIC -DPIC /' <Makefile >Makefile.pic \
|
||||
&& $(MAKE) -f Makefile.pic \
|
||||
&& rm -f Makefile.pic; \
|
||||
fi
|
||||
|
||||
# HACKETY HACKETY HACK
|
||||
if test ! -d CVS; then \
|
||||
cd extras/faad/libfaad \
|
||||
&& $(MAKE) clean \
|
||||
&& $(MAKE) AM_CFLAGS=-fPIC; \
|
||||
fi
|
||||
endif
|
||||
|
||||
# Build all the rest, with the PIC libs
|
||||
$(MAKE)
|
||||
|
||||
touch build-stamp
|
||||
@ -118,10 +142,10 @@ clean:
|
||||
|
||||
# Check that we have an ffmpeg tree in here (can be a symlink)
|
||||
test -d extras/ffmpeg
|
||||
-if test ! -d CVS; then cd extras/ffmpeg && make distclean; fi
|
||||
-if test ! -d CVS; then cd extras/ffmpeg && $(MAKE) distclean; fi
|
||||
# Check that we have an faad tree in here (can be a symlink)
|
||||
test -d extras/faad
|
||||
-if test ! -d CVS; then cd extras/faad && make distclean; fi
|
||||
-if test ! -d CVS; then cd extras/faad && $(MAKE) distclean; fi
|
||||
|
||||
# Remove spurious autotools stuff
|
||||
rm -f config.log confdefs.h
|
||||
|
Loading…
Reference in New Issue
Block a user