r219 - in unstable/vlc/debian: . patches
Samuel Hocevar
sho at alioth.debian.org
Sat Mar 17 11:25:10 CET 2007
Author: sho
Date: 2007-03-17 10:25:10 +0000 (Sat, 17 Mar 2007)
New Revision: 219
Added:
unstable/vlc/debian/libvlc0-dev.links
unstable/vlc/debian/mozilla-plugin-vlc.links
unstable/vlc/debian/patches/001_am_maintainer_mode.diff
unstable/vlc/debian/patches/050_bootstrap.diff
unstable/vlc/debian/patches/100_no_wx_updates.diff
unstable/vlc/debian/patches/101_certificates_paths.diff
unstable/vlc/debian/patches/102_dejavu_font.diff
unstable/vlc/debian/patches/103_kfreebsd.diff
unstable/vlc/debian/patches/104_notify.diff
unstable/vlc/debian/patches/105_audio_format_crash.diff
unstable/vlc/debian/patches/200_osdmenu_paths.diff
unstable/vlc/debian/vlc-nox.links
unstable/vlc/debian/vlc-plugin-arts.links
unstable/vlc/debian/vlc-plugin-esd.links
unstable/vlc/debian/vlc-plugin-ggi.links
unstable/vlc/debian/vlc-plugin-glide.links
unstable/vlc/debian/vlc-plugin-sdl.links
unstable/vlc/debian/vlc-plugin-svgalib.links
unstable/vlc/debian/vlc.links
Removed:
unstable/vlc/debian/patches/010_no-wx-updates.diff
unstable/vlc/debian/patches/010_osdmenu-paths.diff
unstable/vlc/debian/patches/020_certificates_paths.diff
unstable/vlc/debian/patches/020_dejavu_font.diff
unstable/vlc/debian/patches/020_kfreebsd.diff
unstable/vlc/debian/patches/020_notify.diff
unstable/vlc/debian/patches/021_x264_powerpc.diff
unstable/vlc/debian/patches/030_audio_format_crash.diff
Modified:
unstable/vlc/debian/changelog
unstable/vlc/debian/compat
unstable/vlc/debian/control
unstable/vlc/debian/mozilla-plugin-vlc.dirs
unstable/vlc/debian/patches/series
unstable/vlc/debian/rules
Log:
vlc (0.8.6.a.debian-5) UNRELEASED; urgency=low
* Refreshed and renamed all patches.
* debian/control:
+ Set pkg-multimedia-maintainers as main maintainer.
+ Fixed Vcs fields.
* debian/compat:
+ Set compat to 5.
* debian/rules:
+ Big cleanup.
+ Distribute libvlc.a again.
+ Switch to AM_MAINTAINER_MODE instead of touching all files.
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 16 Mar 2007 23:58:03 +0100
Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/changelog 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,3 +1,25 @@
+vlc (0.8.6.a.debian-5) UNRELEASED; urgency=low
+
+ * Refreshed and renamed all patches.
+
+ * debian/control:
+ + Set pkg-multimedia-maintainers as main maintainer.
+ + Fixed Vcs fields.
+ * debian/compat:
+ + Set compat to 5.
+ * debian/rules:
+ + Big cleanup.
+ + Distribute libvlc.a again.
+ + Switch to AM_MAINTAINER_MODE instead of touching all files.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 16 Mar 2007 23:58:03 +0100
+
+vlc (0.8.6.a.debian-4) unstable; urgency=low
+
+ * *sigh*, libfaad-dev build-depend was in fact missing.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 13 Mar 2007 10:39:04 +0100
+
vlc (0.8.6.a.debian-3) unstable; urgency=low
* debian/control:
Modified: unstable/vlc/debian/compat
===================================================================
--- unstable/vlc/debian/compat 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/compat 2007-03-17 10:25:10 UTC (rev 219)
@@ -1 +1 @@
-4
+5
Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/control 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,12 +1,12 @@
Source: vlc
Section: graphics
Priority: optional
-Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Uploaders: Clément Stenac <zorglub at debian.org>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libx264-dev
+Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Clément Stenac <zorglub at debian.org>
+Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libx264-dev, libfaad-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
-XS-Vcs-Browser: http://trac.videolan.org/pkg-multimedia/browser/unstable/vlc
+XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/vlc
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
Package: vlc
Section: graphics
Added: unstable/vlc/debian/libvlc0-dev.links
===================================================================
--- unstable/vlc/debian/libvlc0-dev.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/libvlc0-dev.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/libvlc0 /usr/share/doc/libvlc0-dev
Modified: unstable/vlc/debian/mozilla-plugin-vlc.dirs
===================================================================
--- unstable/vlc/debian/mozilla-plugin-vlc.dirs 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/mozilla-plugin-vlc.dirs 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,2 +1,2 @@
-usr/lib
+usr/lib/mozilla-firefox/plugins
usr/share/doc
Added: unstable/vlc/debian/mozilla-plugin-vlc.links
===================================================================
--- unstable/vlc/debian/mozilla-plugin-vlc.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/mozilla-plugin-vlc.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1,2 @@
+/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc
+/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so
Added: unstable/vlc/debian/patches/001_am_maintainer_mode.diff
===================================================================
--- unstable/vlc/debian/patches/001_am_maintainer_mode.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/001_am_maintainer_mode.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1,14 @@
+Index: vlc-0.8.6.a.debian/configure.ac
+===================================================================
+--- vlc-0.8.6.a.debian.orig/configure.ac 2007-03-17 00:09:31.000000000 +0100
++++ vlc-0.8.6.a.debian/configure.ac 2007-03-17 00:09:45.000000000 +0100
+@@ -23,9 +23,6 @@
+ dnl automake behavior, you've likely never heard of maintainer mode, so we
+ dnl can't expect you to enable it manually.
+
+-AS_IF([test "x${enable_maintainer_mode}" != "xno"],
+- [enable_maintainer_mode="yes"])
+-
+ dnl HA! HA!
+ AM_MAINTAINER_MODE
+
Deleted: unstable/vlc/debian/patches/010_no-wx-updates.diff
===================================================================
--- unstable/vlc/debian/patches/010_no-wx-updates.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/010_no-wx-updates.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,15 +0,0 @@
-Index: vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/gui/wxwidgets/interface.cpp 2006-09-18 12:28:21.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp 2007-01-08 02:25:50.000000000 +0100
-@@ -606,8 +606,8 @@
- /* Create the "Help" menu */
- wxMenu *help_menu = new wxMenu;
- help_menu->Append( About_Event, wxU(_("About...")) );
-- help_menu->AppendSeparator();
-- help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
-+// help_menu->AppendSeparator();
-+// help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
-
- /* Append the freshly created menus to the menu bar... */
- wxMenuBar *menubar = new wxMenuBar();
Deleted: unstable/vlc/debian/patches/010_osdmenu-paths.diff
===================================================================
--- unstable/vlc/debian/patches/010_osdmenu-paths.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/010_osdmenu-paths.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,33 +0,0 @@
-Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg
-===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg 2006-04-24 16:21:46.000000000 +0200
-@@ -1,4 +1,4 @@
--dir share/osdmenu/default
-+dir /usr/share/vlc/osdmenu/default
- action key-play-pause (0,0)
- unselect unselected.png
- select selection/play_pause.png
-Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg
-===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg 2006-04-24 16:21:46.000000000 +0200
-@@ -1,4 +1,4 @@
--dir share/osdmenu/dvd
-+dir /usr/share/vlc/osdmenu/dvd
- action key-play (0,0)
- unselect unselect/barroff.png
- select selection/play.png
-Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c 2006-04-19 09:25:11.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c 2006-04-24 16:21:46.000000000 +0200
-@@ -92,7 +92,7 @@
- #if defined( WIN32 ) || defined( UNDER_CE )
- #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
- #else
--#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
-+#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
- #endif
-
- #define OSD_UPDATE_MIN 0
Deleted: unstable/vlc/debian/patches/020_certificates_paths.diff
===================================================================
--- unstable/vlc/debian/patches/020_certificates_paths.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/020_certificates_paths.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,15 +0,0 @@
-Index: vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/misc/gnutls.c 2006-09-22 17:14:31.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c 2007-01-08 02:28:18.000000000 +0100
-@@ -681,6 +681,10 @@
- p_sys->x509_cred, psz_path, VLC_FALSE );
- free( psz_path );
- }
-+ gnutls_Addx509File( (vlc_object_t *)p_session,
-+ p_sys->x509_cred,
-+ "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
-+
- p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
- }
- else
Deleted: unstable/vlc/debian/patches/020_dejavu_font.diff
===================================================================
--- unstable/vlc/debian/patches/020_dejavu_font.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/020_dejavu_font.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #elif defined( WIN32 )
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf"
- #endif
-
- #if defined(HAVE_FRIBIDI)
Deleted: unstable/vlc/debian/patches/020_kfreebsd.diff
===================================================================
--- unstable/vlc/debian/patches/020_kfreebsd.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/020_kfreebsd.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,20 +0,0 @@
-Index: vlc-0.8.6.debian/modules/misc/network/ipv6.c
-===================================================================
---- vlc-0.8.6.debian.orig/modules/misc/network/ipv6.c 2006-12-11 12:32:22.000000000 +0100
-+++ vlc-0.8.6.debian/modules/misc/network/ipv6.c 2006-12-11 12:32:38.000000000 +0100
-@@ -57,6 +57,7 @@
- #if defined (WIN32) && !defined (MCAST_JOIN_SOURCE_GROUP)
- /* Interim Vista definitions */
- # define MCAST_JOIN_SOURCE_GROUP 45 /* from <ws2ipdef.h> */
-+#if defined __GLIBC__ && !defined __FreeBSD_kernel__
- struct group_source_req
- {
- uint32_t gsr_interface; /* interface index */
-@@ -64,6 +65,7 @@
- struct sockaddr_storage gsr_source; /* source address */
- };
- #endif
-+#endif
-
- /*****************************************************************************
- * Local prototypes
Deleted: unstable/vlc/debian/patches/020_notify.diff
===================================================================
--- unstable/vlc/debian/patches/020_notify.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/020_notify.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.6a.debian/modules/misc/notify.c
-===================================================================
---- vlc-0.8.6a.debian.orig/modules/misc/notify.c 2007-01-03 19:27:57.000000000 +0100
-+++ vlc-0.8.6a.debian/modules/misc/notify.c 2007-01-11 18:30:48.000000000 +0100
-@@ -205,7 +205,7 @@
- NotifyNotification * notification;
- notification = notify_notification_new( _("Now Playing"),
- psz_temp,
-- DATA_PATH "/vlc48x48.png",NULL);
-+ "/usr/share/pixmaps/vlc.png",NULL);
- notify_notification_set_timeout( notification,
- config_GetInt(p_this, "notify-timeout") );
- notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
Deleted: unstable/vlc/debian/patches/021_x264_powerpc.diff
===================================================================
--- unstable/vlc/debian/patches/021_x264_powerpc.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/021_x264_powerpc.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,194 +0,0 @@
-Index: vlc/extras/x264/common/ppc/quant.c
-===================================================================
---- vlc/extras/x264/common/ppc/quant.c (revision 601)
-+++ vlc/extras/x264/common/ppc/quant.c (revision 621)
-@@ -18,8 +18,4 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- *****************************************************************************/
--
--#ifdef HAVE_ALTIVEC_H
--#include <altivec.h>
--#endif
-
- #include "common/common.h"
-@@ -54,29 +50,29 @@
- temp2v = vec_xor(temp2v, mskB); \
- temp1v = vec_adds(temp1v, vec_and(mskA, one)); \
--vec_st(temp1v, (dct0), dct); \
-+vec_st(temp1v, (dct0), (int16_t*)dct); \
- temp2v = vec_adds(temp2v, vec_and(mskB, one)); \
--vec_st(temp2v, (dct1), dct);
-+vec_st(temp2v, (dct1), (int16_t*)dct);
-
- void x264_quant_4x4_altivec( int16_t dct[4][4], int quant_mf[4][4], int const i_qbits, int const f ) {
- vector bool short mskA;
-- vec_s32_t i_qbitsv;
-+ vec_u32_t i_qbitsv;
- vec_u16_t coefvA;
- vec_u32_t multEvenvA, multOddvA;
-- vec_u32_t mfvA;
-+ vec_u16_t mfvA;
- vec_s16_t zerov, one;
-- vec_s32_t fV;
-+ vec_u32_t fV;
-
- vector bool short mskB;
- vec_u16_t coefvB;
- vec_u32_t multEvenvB, multOddvB;
-- vec_u32_t mfvB;
-+ vec_u16_t mfvB;
-
- vec_s16_t temp1v, temp2v;
-
-- vect_sint_u qbits_u;
-+ vect_int_u qbits_u;
- qbits_u.s[0]=i_qbits;
- i_qbitsv = vec_splat(qbits_u.v, 0);
-
-- vect_sint_u f_u;
-+ vect_int_u f_u;
- f_u.s[0]=f;
-
-@@ -114,16 +110,16 @@
- temp2v = vec_xor(temp2v, mskB); \
- temp1v = vec_add(temp1v, vec_and(mskA, one)); \
--vec_st(temp1v, (dct0), dct); \
-+vec_st(temp1v, (dct0), (int16_t*)dct); \
- temp2v = vec_add(temp2v, vec_and(mskB, one)); \
--vec_st(temp2v, (dct1), dct);
-+vec_st(temp2v, (dct1), (int16_t*)dct);
-
-
- void x264_quant_4x4_dc_altivec( int16_t dct[4][4], int i_quant_mf, int const i_qbits, int const f ) {
- vector bool short mskA;
-- vec_s32_t i_qbitsv;
-+ vec_u32_t i_qbitsv;
- vec_u16_t coefvA;
- vec_u32_t multEvenvA, multOddvA;
- vec_s16_t zerov, one;
-- vec_s32_t fV;
-+ vec_u32_t fV;
-
- vector bool short mskB;
-@@ -133,15 +129,14 @@
- vec_s16_t temp1v, temp2v;
-
-- vec_u32_t mfv;
-- vect_int_u mf_u;
-+ vec_u16_t mfv;
-+ vect_ushort_u mf_u;
- mf_u.s[0]=i_quant_mf;
- mfv = vec_splat( mf_u.v, 0 );
-- mfv = vec_packs( mfv, mfv);
-
-- vect_sint_u qbits_u;
-+ vect_int_u qbits_u;
- qbits_u.s[0]=i_qbits;
- i_qbitsv = vec_splat(qbits_u.v, 0);
-
-- vect_sint_u f_u;
-+ vect_int_u f_u;
- f_u.s[0]=f;
- fV = vec_splat(f_u.v, 0);
-@@ -156,13 +151,15 @@
- void x264_quant_8x8_altivec( int16_t dct[8][8], int quant_mf[8][8], int const i_qbits, int const f ) {
- vector bool short mskA;
-- vec_s32_t i_qbitsv;
-+ vec_u32_t i_qbitsv;
- vec_u16_t coefvA;
-- vec_s32_t multEvenvA, multOddvA, mfvA;
-+ vec_u32_t multEvenvA, multOddvA;
-+ vec_u16_t mfvA;
- vec_s16_t zerov, one;
-- vec_s32_t fV;
-+ vec_u32_t fV;
-
- vector bool short mskB;
- vec_u16_t coefvB;
-- vec_u32_t multEvenvB, multOddvB, mfvB;
-+ vec_u32_t multEvenvB, multOddvB;
-+ vec_u16_t mfvB;
-
- vec_s16_t temp1v, temp2v;
-@@ -172,5 +169,5 @@
- i_qbitsv = vec_splat(qbits_u.v, 0);
-
-- vect_sint_u f_u;
-+ vect_int_u f_u;
- f_u.s[0]=f;
- fV = vec_splat(f_u.v, 0);
-Index: vlc/extras/x264/common/ppc/dct.c
-===================================================================
---- vlc/extras/x264/common/ppc/dct.c (revision 604)
-+++ vlc/extras/x264/common/ppc/dct.c (revision 621)
-@@ -61,6 +61,6 @@
- VEC_DCT( dct0v, dct1v, dct2v, dct3v, tmp0v, tmp1v, tmp2v, tmp3v );
-
-- vec_st(vec_perm(tmp0v, tmp1v, permHighv), 0, dct);
-- vec_st(vec_perm(tmp2v, tmp3v, permHighv), 16, dct);
-+ vec_st(vec_perm(tmp0v, tmp1v, permHighv), 0, (int16_t*)dct);
-+ vec_st(vec_perm(tmp2v, tmp3v, permHighv), 16, (int16_t*)dct);
- }
-
-@@ -95,12 +95,12 @@
- VEC_DCT( dct4v, dct5v, dct6v, dct7v, tmp4v, tmp5v, tmp6v, tmp7v );
-
-- vec_st(vec_perm(tmp0v, tmp1v, permHighv), 0, dct);
-- vec_st(vec_perm(tmp2v, tmp3v, permHighv), 16, dct);
-- vec_st(vec_perm(tmp4v, tmp5v, permHighv), 32, dct);
-- vec_st(vec_perm(tmp6v, tmp7v, permHighv), 48, dct);
-- vec_st(vec_perm(tmp0v, tmp1v, permLowv), 64, dct);
-- vec_st(vec_perm(tmp2v, tmp3v, permLowv), 80, dct);
-- vec_st(vec_perm(tmp4v, tmp5v, permLowv), 96, dct);
-- vec_st(vec_perm(tmp6v, tmp7v, permLowv), 112, dct);
-+ vec_st(vec_perm(tmp0v, tmp1v, permHighv), 0, (int16_t*)dct);
-+ vec_st(vec_perm(tmp2v, tmp3v, permHighv), 16, (int16_t*)dct);
-+ vec_st(vec_perm(tmp4v, tmp5v, permHighv), 32, (int16_t*)dct);
-+ vec_st(vec_perm(tmp6v, tmp7v, permHighv), 48, (int16_t*)dct);
-+ vec_st(vec_perm(tmp0v, tmp1v, permLowv), 64, (int16_t*)dct);
-+ vec_st(vec_perm(tmp2v, tmp3v, permLowv), 80, (int16_t*)dct);
-+ vec_st(vec_perm(tmp4v, tmp5v, permLowv), 96, (int16_t*)dct);
-+ vec_st(vec_perm(tmp6v, tmp7v, permLowv), 112, (int16_t*)dct);
- }
-
-@@ -312,6 +312,6 @@
- void x264_add8x8_idct8_altivec( uint8_t *dst, int16_t dct[8][8] )
- {
-- vec_s16_t onev = vec_splat_s16(1);
-- vec_s16_t twov = vec_splat_s16(2);
-+ vec_u16_t onev = vec_splat_s16(1);
-+ vec_u16_t twov = vec_splat_s16(2);
-
- dct[0][0] += 32; // rounding for the >>6 at the end
-@@ -342,5 +342,5 @@
- vec_u8_t perm_ldv = vec_lvsl(0, dst);
- vec_u8_t perm_stv = vec_lvsr(8, dst);
-- vec_s16_t sixv = vec_splat_s16(6);
-+ vec_u16_t sixv = vec_splat_s16(6);
- const vec_u8_t sel = (vec_u8_t) CV(0,0,0,0,0,0,0,0,-1,-1,-1,-1,-1,-1,-1,-1);
- LOAD_ZERO;
-Index: vlc/extras/x264/common/ppc/quant.h
-===================================================================
---- vlc/extras/x264/common/ppc/quant.h (revision 601)
-+++ vlc/extras/x264/common/ppc/quant.h (revision 621)
-@@ -19,4 +19,8 @@
- *****************************************************************************/
-
-+#ifdef SYS_LINUX
-+#include <altivec.h>
-+#endif
-+
- #ifndef _PPC_QUANT_H
- #define _PPC_QUANT_H 1
-@@ -28,8 +32,7 @@
-
- typedef union {
-- signed int s[4];
-- vector signed int v;
--} vect_sint_u;
--
-+ unsigned short s[8];
-+ vector unsigned short v;
-+} vect_ushort_u;
-
- void x264_quant_4x4_altivec( int16_t dct[4][4], int quant_mf[4][4], int const i_qbits, int const f );
Deleted: unstable/vlc/debian/patches/030_audio_format_crash.diff
===================================================================
--- unstable/vlc/debian/patches/030_audio_format_crash.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/030_audio_format_crash.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,213 +0,0 @@
-Index: vlc/modules/audio_filter/format.c
-===================================================================
---- vlc/modules/audio_filter/format.c (revision 19298)
-+++ vlc/modules/audio_filter/format.c (revision 19300)
-@@ -244,7 +244,7 @@
- uint8_t *p_out = (uint8_t *)p_in;
- int32_t out;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 4; i--; )
- {
- if ( *p_in >= 1.0 ) out = 8388607;
- else if ( *p_in < -1.0 ) out = -8388608;
-@@ -271,7 +271,7 @@
- float *p_in = (float *)p_block->p_buffer;
- int16_t *p_out = (int16_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 4; i--; )
- {
- #if 0
- /* Slow version. */
-@@ -299,7 +299,7 @@
- float *p_in = (float *)p_block->p_buffer;
- uint16_t *p_out = (uint16_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 4; i--; )
- {
- if ( *p_in >= 1.0 ) *p_out = 65535;
- else if ( *p_in < -1.0 ) *p_out = 0;
-@@ -319,7 +319,7 @@
- int i;
-
- p_block_out =
-- p_filter->pf_audio_buffer_new( p_filter, p_block->i_buffer*4/3 );
-+ p_filter->pf_audio_buffer_new( p_filter, p_block->i_buffer * 4 / 3 );
- if( !p_block_out )
- {
- msg_Warn( p_filter, "can't get output buffer" );
-@@ -329,8 +329,9 @@
- p_in = p_block->p_buffer;
- p_out = (float *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 3; i--; )
- {
-+ /* FIXME: unaligned reads */
- #ifdef WORDS_BIGENDIAN
- *p_out = ((float)( (((int32_t)*(int16_t *)(p_in)) << 8) + p_in[2]))
- #else
-@@ -357,7 +358,7 @@
- uint8_t *p_in = (uint8_t *)p_block->p_buffer;
- uint8_t *p_out = (uint8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 3; i--; )
- {
- #ifdef WORDS_BIGENDIAN
- *p_out++ = *p_in++;
-@@ -392,7 +393,7 @@
- p_in = (int16_t *)p_block->p_buffer;
- p_out = (float *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- {
- #if 0
- /* Slow version */
-@@ -422,7 +423,7 @@
- static block_t *U16toFloat32( filter_t *p_filter, block_t *p_block )
- {
- block_t *p_block_out;
-- int16_t *p_in;
-+ uint16_t *p_in;
- float *p_out;
- int i;
-
-@@ -434,10 +435,10 @@
- return NULL;
- }
-
-- p_in = (int16_t *)p_block->p_buffer;
-+ p_in = (uint16_t *)p_block->p_buffer;
- p_out = (float *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- {
- *p_out++ = (float)(*p_in++ - 32768) / 32768.0;
- }
-@@ -469,7 +470,7 @@
- p_in = (uint8_t *)p_block->p_buffer;
- p_out = (uint8_t *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- {
- #ifdef WORDS_BIGENDIAN
- *p_out++ = *p_in++;
-@@ -498,7 +499,7 @@
- int16_t *p_in = (int16_t *)p_block->p_buffer;
- int8_t *p_out = (int8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = (*p_in++) >> 8;
-
- p_block->i_buffer /= 2;
-@@ -510,7 +511,7 @@
- int16_t *p_in = (int16_t *)p_block->p_buffer;
- uint8_t *p_out = (uint8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = ((*p_in++) + 32768) >> 8;
-
- p_block->i_buffer /= 2;
-@@ -522,7 +523,7 @@
- int16_t *p_in = (int16_t *)p_block->p_buffer;
- uint16_t *p_out = (uint16_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = (*p_in++) + 32768;
-
- return p_block;
-@@ -534,7 +535,7 @@
- uint16_t *p_in = (uint16_t *)p_block->p_buffer;
- int8_t *p_out = (int8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = ((int)(*p_in++) - 32768) >> 8;
-
- p_block->i_buffer /= 2;
-@@ -546,7 +547,7 @@
- uint16_t *p_in = (uint16_t *)p_block->p_buffer;
- uint8_t *p_out = (uint8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = (*p_in++) >> 8;
-
- p_block->i_buffer /= 2;
-@@ -555,10 +556,10 @@
- static block_t *U16toS16( filter_t *p_filter, block_t *p_block )
- {
- int i;
-- int16_t *p_in = (int16_t *)p_block->p_buffer;
-- uint16_t *p_out = (uint16_t *)p_in;
-+ uint16_t *p_in = (uint16_t *)p_block->p_buffer;
-+ int16_t *p_out = (int16_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer / 2; i--; )
- *p_out++ = (int)(*p_in++) - 32768;
-
- return p_block;
-@@ -570,7 +571,7 @@
- int8_t *p_in = (int8_t *)p_block->p_buffer;
- uint8_t *p_out = (uint8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = ((*p_in++) + 128);
-
- return p_block;
-@@ -581,7 +582,7 @@
- uint8_t *p_in = (uint8_t *)p_block->p_buffer;
- int8_t *p_out = (int8_t *)p_in;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = ((*p_in++) - 128);
-
- return p_block;
-@@ -606,7 +607,7 @@
- p_in = (int8_t *)p_block->p_buffer;
- p_out = (uint16_t *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = ((*p_in++) + 128) << 8;
-
- p_block_out->i_samples = p_block->i_samples;
-@@ -637,7 +638,7 @@
- p_in = (uint8_t *)p_block->p_buffer;
- p_out = (int16_t *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = ((*p_in++) - 128) << 8;
-
- p_block_out->i_samples = p_block->i_samples;
-@@ -669,7 +670,7 @@
- p_in = (int8_t *)p_block->p_buffer;
- p_out = (int16_t *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = (*p_in++) << 8;
-
- p_block_out->i_samples = p_block->i_samples;
-@@ -700,7 +701,7 @@
- p_in = (uint8_t *)p_block->p_buffer;
- p_out = (uint16_t *)p_block_out->p_buffer;
-
-- for( i = p_block->i_buffer*8/p_filter->fmt_in.audio.i_bitspersample; i--; )
-+ for( i = p_block->i_buffer; i--; )
- *p_out++ = (*p_in++) << 8;
-
- p_block_out->i_samples = p_block->i_samples;
Added: unstable/vlc/debian/patches/050_bootstrap.diff
===================================================================
--- unstable/vlc/debian/patches/050_bootstrap.diff 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/050_bootstrap.diff 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1,15 @@
+Index: vlc-0.8.6.a.debian/configure
+===================================================================
+--- vlc-0.8.6.a.debian.orig/configure 2007-03-17 00:16:23.000000000 +0100
++++ vlc-0.8.6.a.debian/configure 2007-03-17 00:17:21.000000000 +0100
+@@ -2952,10 +2952,6 @@
+
+
+
+-if test "x${enable_maintainer_mode}" != "xno"; then
+- enable_maintainer_mode="yes"
+-fi
+-
+
+ { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
Copied: unstable/vlc/debian/patches/100_no_wx_updates.diff (from rev 217, unstable/vlc/debian/patches/010_no-wx-updates.diff)
Copied: unstable/vlc/debian/patches/101_certificates_paths.diff (from rev 217, unstable/vlc/debian/patches/020_certificates_paths.diff)
Copied: unstable/vlc/debian/patches/102_dejavu_font.diff (from rev 217, unstable/vlc/debian/patches/020_dejavu_font.diff)
Copied: unstable/vlc/debian/patches/103_kfreebsd.diff (from rev 217, unstable/vlc/debian/patches/020_kfreebsd.diff)
Copied: unstable/vlc/debian/patches/104_notify.diff (from rev 217, unstable/vlc/debian/patches/020_notify.diff)
Copied: unstable/vlc/debian/patches/105_audio_format_crash.diff (from rev 217, unstable/vlc/debian/patches/030_audio_format_crash.diff)
Copied: unstable/vlc/debian/patches/200_osdmenu_paths.diff (from rev 217, unstable/vlc/debian/patches/010_osdmenu-paths.diff)
Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/patches/series 2007-03-17 10:25:10 UTC (rev 219)
@@ -1,9 +1,9 @@
-010_no-wx-updates.diff
-010_osdmenu-paths.diff
-#020_xulrunner.diff
-020_dejavu_font.diff
-020_notify.diff
-020_certificates_paths.diff
-020_kfreebsd.diff
-021_x264_powerpc.diff
-030_audio_format_crash.diff
+001_am_maintainer_mode.diff
+050_bootstrap.diff
+100_no_wx_updates.diff
+101_certificates_paths.diff
+102_dejavu_font.diff
+103_kfreebsd.diff
+104_notify.diff
+105_audio_format_crash.diff
+200_osdmenu_paths.diff
Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/rules 2007-03-17 10:25:10 UTC (rev 219)
@@ -17,8 +17,8 @@
#
# Compilation options
#
-vlc_confflags = --enable-release --prefix=/usr
-vlc_confflags += \
+confflags += --enable-release --prefix=/usr
+confflags += \
--enable-libtool \
--disable-gnome \
--disable-gtk \
@@ -80,58 +80,32 @@
# These ones are only for Linux
ifeq ($(DEB_HOST_ARCH_OS),linux)
-vlc_confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
+confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
endif
# Glide and svgalib are only for x86 on Linux
ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
-vlc_confflags += --enable-glide
-vlc_confflags += --enable-svgalib
+confflags += --enable-glide
+confflags += --enable-svgalib
endif
# Remove --without-dvdcss in non-totalitarian countries
-vlc_confflags += --enable-dvd --without-dvdcss
+confflags += --enable-dvd --without-dvdcss
# A few shortcuts
VIDDIR = usr/share/vlc
PIXDIR = usr/share/pixmaps
-APPDIR = usr/share/applications
-
-#
-# Build rules
-#
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Patch package
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- # Touch stuff
- touch configure.ac
- touch aclocal.m4
- touch configure
- touch config.h.in
- touch `find . -name Makefile.in`
- # Configure VLC
- ./configure --mandir=$${prefix}/share/man \
- --infodir=$${prefix}/share/info $(confflags) $(vlc_confflags)
- touch configure-stamp
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp:
dh_testdir
- #### Build only VLC, with the non-PIC libs
- ###$(MAKE) include/vlc_symbols.h
- ###cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
- ###$(MAKE) vlc
- #### Build all the rest, with the PIC libs
- ###AM_MAKEFLAGS='builtin=no' $(MAKE)
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ ./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
+ $(MAKE) src/libvlc.la
+ ./configure --mandir=$${prefix}/share/man $(confflags)
$(MAKE)
-
- # Minor test, to see which plugins were built and whether they load
- # properly.
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ # Check which plugins were built and whether they load properly.
./vlc --reset-plugins-cache -l -I rc vlc:quit
endif
touch build-stamp
@@ -143,7 +117,7 @@
> debian/vlc-nox.install.kfreebsd-i386
cp debian/vlc-nox.install.kfreebsd-i386 \
debian/vlc-nox.install.kfreebsd-amd64
- rm -f configure-stamp build-stamp
+ rm -f build-stamp
# Clean VLC
-$(MAKE) distclean
# Clean zsh completion stuff
@@ -162,29 +136,26 @@
dh_testroot
dh_clean -k
dh_installdirs
-
$(MAKE) install DESTDIR=`pwd`/debian/tmp/
-
+ cp src/.libs/libvlc.a debian/tmp/usr/lib
# Clean up libtool crap
find debian/tmp -name '*.la' -exec rm '{}' ';'
-
# Remove useless stuff
rm -Rf debian/tmp/$(VIDDIR)/skins
rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
-
# Move stuff around
mkdir -p debian/tmp/$(PIXDIR)
-mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
-mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
-
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
-
- # Check that we did not install a plugin linked with libX11 in vlc-nox
+ # Clean up
+ rm -f debian/vlc/$(VIDDIR)/*.png
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ # Check that we did not install a plugin linked with libX11 in vlc-nox
BORKED=no; \
for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
if ldd $$file | grep -q libX11; then \
@@ -195,34 +166,6 @@
if test "$$BORKED" = yes; then exit 1; fi
endif
- # manpage symlinks
- ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
- ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
-
- # /usr/share/doc symlinks
- ln -s vlc debian/vlc-nox/usr/share/doc/vlc-nox
- ln -s libvlc0 debian/libvlc0-dev/usr/share/doc/libvlc0-dev
- ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
- ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
- ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
- ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
- ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
- ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
- ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
-endif
-
- # links for firefox
- mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
- ln -s ../../mozilla/plugins/libvlcplugin.so debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
- mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
- ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
-
- cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
-
- # Clean up
- rm -f debian/vlc/$(VIDDIR)/*.png
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
@@ -239,11 +182,9 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs -p vlc-nox
dh_installdocs -p libvlc0
dh_buildinfo -p vlc-nox
-# dh_installexamples
dh_installmenu -s
dh_installmime -s
dh_installman doc/vlc.1 -p vlc-nox
Added: unstable/vlc/debian/vlc-nox.links
===================================================================
--- unstable/vlc/debian/vlc-nox.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-nox.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-nox
Added: unstable/vlc/debian/vlc-plugin-arts.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-arts.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-arts.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-arts
Added: unstable/vlc/debian/vlc-plugin-esd.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-esd.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-esd.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-esd
Added: unstable/vlc/debian/vlc-plugin-ggi.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-ggi.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-ggi.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-ggi
Added: unstable/vlc/debian/vlc-plugin-glide.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-glide.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-glide.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-glide
Added: unstable/vlc/debian/vlc-plugin-sdl.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-sdl.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-sdl.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-sdl
Added: unstable/vlc/debian/vlc-plugin-svgalib.links
===================================================================
--- unstable/vlc/debian/vlc-plugin-svgalib.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc-plugin-svgalib.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1 @@
+/usr/share/doc/vlc /usr/share/doc/vlc-plugin-svgalib
Added: unstable/vlc/debian/vlc.links
===================================================================
--- unstable/vlc/debian/vlc.links 2007-03-16 22:50:22 UTC (rev 218)
+++ unstable/vlc/debian/vlc.links 2007-03-17 10:25:10 UTC (rev 219)
@@ -0,0 +1,3 @@
+/usr/share/vlc/vlc.xpm /usr/share/vlc/wxvlc.xpm
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
+/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/wxvlc.1.gz
More information about the Pkg-multimedia-commits
mailing list