Bug#399713: marked as done (vlc: FTBFS on GNU/kFreeBSD (needs mini fixup in debian/rules))

Wed, 21 Feb 2007 07:21:46 -0800 

Your message dated Wed, 21 Feb 2007 15:17:06 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#399713: fixed in vlc 0.8.6.a.debian-2
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: vlc
Severity: important
Version: 0.8.6-svn20061012.debian-1
Tags: patch

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs to disable alsa, dv, v4l, pvr modules
and two small tweaks to sources.
Please find attached patch with that.

Thanks in advance

                        Petr
only in patch2:
unchanged:
--- vlc-0.8.6-svn20061012.debian.orig/extras/x264/configure
+++ vlc-0.8.6-svn20061012.debian/extras/x264/configure
@@ -96,6 +96,11 @@
     CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
     LDFLAGS="$LDFLAGS -lm"
     ;;
+  kfreebsd*-gnu)
+    SYS="FREEBSD"
+    CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
+    LDFLAGS="$LDFLAGS -lm"
+    ;;
   cygwin*)
     SYS="CYGWIN"
     CFLAGS="$CFLAGS -mno-cygwin"
only in patch2:
unchanged:
--- vlc-0.8.6-svn20061012.debian.orig/modules/misc/network/ipv6.c
+++ vlc-0.8.6-svn20061012.debian/modules/misc/network/ipv6.c
@@ -61,6 +61,7 @@
 # else
 #  define MCAST_JOIN_SOURCE_GROUP 46
 # endif
+#if !(defined(__FreeBSD_kernel__) && defined(__GLIBC__))
 struct group_source_req
 {
        uint32_t           gsr_interface;  /* interface index */
@@ -68,6 +69,7 @@
        struct sockaddr_storage gsr_source;     /* source address */
 };
 #endif
+#endif
 
 /*****************************************************************************
  * Local prototypes
diff -u vlc-0.8.6-svn20061012.debian/debian/control 
vlc-0.8.6-svn20061012.debian/debian/control
--- vlc-0.8.6-svn20061012.debian/debian/control
+++ vlc-0.8.6-svn20061012.debian/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
 Uploaders: ClĂŠment Stenac <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], 
gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, 
xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), 
libasound2-dev (>= 0.9.0beta10a), 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), 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, libraw1394-dev, 
libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, 
libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64 
kfreebsd-amd64], gettext, 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
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
 
diff -u vlc-0.8.6-svn20061012.debian/debian/rules 
vlc-0.8.6-svn20061012.debian/debian/rules
--- vlc-0.8.6-svn20061012.debian/debian/rules
+++ vlc-0.8.6-svn20061012.debian/debian/rules
@@ -10,6 +10,8 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) 
+
 confflags = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
 
 #
@@ -28,7 +30,6 @@
        --disable-qt \
        --enable-mad \
        --enable-arts \
-       --enable-alsa \
        --enable-lirc \
        --enable-a52 \
        --enable-aa \
@@ -37,7 +38,6 @@
        --disable-kde \
        --enable-mp4 \
        --enable-dvb \
-       --enable-dv \
        --disable-satellite \
        --enable-ogg \
        --enable-vorbis \
@@ -50,8 +50,6 @@
        --enable-skins2 \
        --enable-freetype \
        --enable-mkv \
-       --enable-v4l \
-       --enable-pvr \
        --enable-speex \
        --enable-caca \
        --enable-live555 \
@@ -77,12 +75,16 @@
        --enable-notify \
        $(NULL)
 
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+vlc_confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
+endif
+
 # These ones are currently shipped with VLC
 vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
 vlc_confflags += --enable-x264 --with-x264-tree=extras/x264
 
-# Glide and svgalib are only for x86
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+# 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
 endif
@@ -158,6 +160,7 @@
 clean:
        dh_testdir
        dh_testroot
+       cp debian/vlc-nox.install.kfreebsd-i386 
debian/vlc-nox.install.kfreebsd-amd64
        rm -f configure-stamp build-stamp
        # Check that we have an x264 tree in here (can be a symlink)
        test -d extras/x264
@@ -228,7 +231,7 @@
        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_CPU),i386)
+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
only in patch2:
unchanged:
--- vlc-0.8.6-svn20061012.debian.orig/debian/vlc-nox.install.kfreebsd-i386
+++ vlc-0.8.6-svn20061012.debian/debian/vlc-nox.install.kfreebsd-i386
@@ -0,0 +1,63 @@
+usr/bin/vlc
+usr/share/doc
+usr/share/locale
+usr/share/vlc/http
+usr/share/vlc/osdmenu
+usr/lib/vlc/access/libvcd_plugin.so
+usr/lib/vlc/access/libvcdx_plugin.so
+usr/lib/vlc/access/libaccess_*.so
+usr/lib/vlc/access/libdvdnav_plugin.so
+usr/lib/vlc/access/libdvdread_plugin.so
+usr/lib/vlc/access/libcdda_plugin.so
+usr/lib/vlc/access_filter
+usr/lib/vlc/access_output
+usr/lib/vlc/audio_filter
+usr/lib/vlc/audio_mixer
+usr/lib/vlc/audio_output/libaout_file_plugin.so
+usr/lib/vlc/audio_output/liboss_plugin.so
+usr/lib/vlc/codec/libcmml_plugin.so
+usr/lib/vlc/codec/libffmpeg_plugin.so
+usr/lib/vlc/codec/libspudec_plugin.so
+usr/lib/vlc/codec/liba52_plugin.so
+usr/lib/vlc/codec/libcinepak_plugin.so
+usr/lib/vlc/codec/libdts_plugin.so
+usr/lib/vlc/codec/libflacdec_plugin.so
+usr/lib/vlc/codec/liblpcm_plugin.so
+usr/lib/vlc/codec/libaraw_plugin.so
+usr/lib/vlc/codec/libvorbis_plugin.so
+usr/lib/vlc/codec/libspeex_plugin.so
+usr/lib/vlc/codec/libadpcm_plugin.so
+usr/lib/vlc/codec/libmpeg_audio_plugin.so
+usr/lib/vlc/codec/liblibmpeg2_plugin.so
+usr/lib/vlc/codec/librawvideo_plugin.so
+usr/lib/vlc/codec/libsubsdec_plugin.so
+usr/lib/vlc/codec/libdvbsub_plugin.so
+usr/lib/vlc/codec/libtwolame_plugin.so
+usr/lib/vlc/codec/libpng_plugin.so
+usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libcvdsub_plugin.so
+usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/control
+usr/lib/vlc/demux
+usr/lib/vlc/gui/libncurses_plugin.so
+usr/lib/vlc/misc/libscreensaver_plugin.so
+usr/lib/vlc/misc/libdummy_plugin.so
+usr/lib/vlc/misc/libmemcpy_plugin.so
+usr/lib/vlc/misc/libipv4_plugin.so
+usr/lib/vlc/misc/libipv6_plugin.so
+usr/lib/vlc/misc/libexport_plugin.so
+usr/lib/vlc/misc/libxtag_plugin.so
+usr/lib/vlc/misc/libxml_plugin.so
+usr/lib/vlc/misc/libfreetype_plugin.so
+usr/lib/vlc/misc/liblogger_plugin.so
+usr/lib/vlc/misc/libvod_rtsp_plugin.so
+usr/lib/vlc/misc/libgnutls_plugin.so
+usr/lib/vlc/misc/libgrowl_plugin.so
+usr/lib/vlc/mux
+usr/lib/vlc/packetizer
+usr/lib/vlc/services_discovery
+usr/lib/vlc/stream_out
+usr/lib/vlc/video_chroma
+usr/lib/vlc/video_filter
+usr/lib/vlc/video_output/libimage_plugin.so
+usr/lib/vlc/visualization/libvisual_plugin.so

--- End Message ---
--- Begin Message --- 
Source: vlc
Source-Version: 0.8.6.a.debian-2

We believe that the bug you reported is fixed in the latest version of
vlc, which is due to be installed in the Debian FTP archive:

libvlc0-dev_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/libvlc0-dev_0.8.6.a.debian-2_i386.deb
libvlc0_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/libvlc0_0.8.6.a.debian-2_i386.deb
mozilla-plugin-vlc_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/mozilla-plugin-vlc_0.8.6.a.debian-2_i386.deb
vlc-nox_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-nox_0.8.6.a.debian-2_i386.deb
vlc-plugin-alsa_0.8.6.a.debian-2_all.deb
  to pool/main/v/vlc/vlc-plugin-alsa_0.8.6.a.debian-2_all.deb
vlc-plugin-arts_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-arts_0.8.6.a.debian-2_i386.deb
vlc-plugin-esd_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-esd_0.8.6.a.debian-2_i386.deb
vlc-plugin-ggi_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-ggi_0.8.6.a.debian-2_i386.deb
vlc-plugin-glide_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-glide_0.8.6.a.debian-2_i386.deb
vlc-plugin-sdl_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-sdl_0.8.6.a.debian-2_i386.deb
vlc-plugin-svgalib_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc-plugin-svgalib_0.8.6.a.debian-2_i386.deb
vlc_0.8.6.a.debian-2.diff.gz
  to pool/main/v/vlc/vlc_0.8.6.a.debian-2.diff.gz
vlc_0.8.6.a.debian-2.dsc
  to pool/main/v/vlc/vlc_0.8.6.a.debian-2.dsc
vlc_0.8.6.a.debian-2_i386.deb
  to pool/main/v/vlc/vlc_0.8.6.a.debian-2_i386.deb
wxvlc_0.8.6.a.debian-2_all.deb
  to pool/main/v/vlc/wxvlc_0.8.6.a.debian-2_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> (supplier of updated vlc 
package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Wed, 21 Feb 2007 12:12:02 +0100
Source: vlc
Binary: wxvlc vlc-plugin-sdl vlc-plugin-ggi vlc-plugin-alsa vlc-plugin-glide 
vlc-plugin-esd mozilla-plugin-vlc vlc libvlc0 vlc-plugin-arts vlc-nox 
vlc-plugin-svgalib libvlc0-dev
Architecture: source i386 all
Version: 0.8.6.a.debian-2
Distribution: unstable
Urgency: high
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
Changed-By: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
Description: 
 libvlc0    - multimedia player and streamer library
 libvlc0-dev - development files for VLC
 mozilla-plugin-vlc - multimedia plugin for web browsers based on VLC
 vlc        - multimedia player and streamer
 vlc-nox    - multimedia player and streamer (without X support)
 vlc-plugin-alsa - dummy transitional package
 vlc-plugin-arts - aRts audio output plugin for VLC
 vlc-plugin-esd - Esound audio output plugin for VLC
 vlc-plugin-ggi - GGI video output plugin for VLC
 vlc-plugin-glide - Glide video output plugin for VLC
 vlc-plugin-sdl - SDL video and audio output plugin for VLC
 vlc-plugin-svgalib - SVGAlib video output plugin for VLC
 wxvlc      - dummy transitional package
Closes: 399713 411438
Changes: 
 vlc (0.8.6.a.debian-2) unstable; urgency=high
 .
   * debian/patches/021_x264_powerpc.diff:
     + Patch from upstream to fix FTBFS on PowerPC (Closes: #411438).
   * debian/rules:
     + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713).
Files: 
 1d2733f39c9400ffaa40950873f65a03 2461 graphics optional 
vlc_0.8.6.a.debian-2.dsc
 c849ce7ff59b2ff2331e988f5fa26bec 33508 graphics optional 
vlc_0.8.6.a.debian-2.diff.gz
 f2d4343aeeb29e2777832e5099ba6926 772 graphics optional 
vlc-plugin-alsa_0.8.6.a.debian-2_all.deb
 2f0bcae1c8706ef5e230a534aee07221 764 graphics optional 
wxvlc_0.8.6.a.debian-2_all.deb
 231f4fc8e25a941b82920d77348fcccf 1142374 graphics optional 
vlc_0.8.6.a.debian-2_i386.deb
 843775363f8b38d2d3c09161d98a5f22 4684958 net optional 
vlc-nox_0.8.6.a.debian-2_i386.deb
 68956735774bbd46afd1f7c39e38e152 982792 libs optional 
libvlc0_0.8.6.a.debian-2_i386.deb
 dbdc9211bf1513250e1dd7b960fec6f2 20124 libdevel optional 
libvlc0-dev_0.8.6.a.debian-2_i386.deb
 7ec92bf78eef7a4e9ee0410a9a8d2e3b 4810 graphics optional 
vlc-plugin-esd_0.8.6.a.debian-2_i386.deb
 547d86b5ff93d95913675b11564c5949 10726 graphics optional 
vlc-plugin-sdl_0.8.6.a.debian-2_i386.deb
 47671ae387759efb5ac45f41e170a82c 5832 graphics optional 
vlc-plugin-ggi_0.8.6.a.debian-2_i386.deb
 8eba0729d91e32433acf0277984d5e81 4122 graphics optional 
vlc-plugin-glide_0.8.6.a.debian-2_i386.deb
 d8f6a20b3ea31d79c51ec65898b4a3cf 4092 graphics optional 
vlc-plugin-arts_0.8.6.a.debian-2_i386.deb
 c23080187562c867676063f5611b1cb6 36172 graphics optional 
mozilla-plugin-vlc_0.8.6.a.debian-2_i386.deb
 296ba7b458e755c58e712387e8fa55c8 4522 graphics optional 
vlc-plugin-svgalib_0.8.6.a.debian-2_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFF3DpjfPP1rylJn2ERAgrsAJ0XZcXG4irmFxKiC1Y+UzZdQe/U1QCfU6zQ
OlT3fZFimZHdY9bdrXP22qQ=
=Ss7l
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to