← Back to branch summary

~ubuntu-branches/ubuntu/hardy/vlc/hardy-security

« back to all changes in this revision

Viewing changes to extras/contrib/bootstrap

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, Martin Hamrle
  • Date: 2008-03-25 20:08:07 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20080325200807-64amsvla1tnnen5s
Tags: 0.8.6.release.e+x264svn20071224+faad2.6.1-0ubuntu1
https://launchpad.net/bugs/206918
https://launchpad.net/bugs/196452
https://launchpad.net/bugs/196417
https://launchpad.net/bugs/204050
[ Mario Limonciello ]
* New upstream version. (LP: #206918)
  - New versioning scheme to bring attention to the fact that
    faad and x264 are in the .orig.tar.gz.
  - Fixes 6 CVEs (LP: #196452)
    + CVE: 2007-6681
    + CVE: 2007-6682
    + CVE: 2007-6683
    + CVE: 2008-0295
    + CVE: 2008-0296
* Drop 021_CVE-2008-0984 as it's included upstream.
* debian/rules:
  - Adjust items touched for faad2 when building.
  - Apply all faad2 patches when building
* debian/control:
  - Add dpatch, libfaad-dev, and autotools-dev to build-depends to allow 
    faad2 to build again.
  - Add automake, cvs, and libtool to build depends (now needed for building VLC)

[ Martin Hamrle ]
 * Add new package with pulse output plugin (LP: #196417)
   - debian/patches/030_pulse.diff:
     + patch from upstream trunk to support pulseaudio output
   - debian/rules:
     + enable pulseaudio
   - debian/control:
     + add dependencies to libpulse-dev
     + new package description
   - Creates a NEW binary package, requiring FFe (LP: #204050)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extras/contrib/bootstrap
3
3
# bootstrap : Set up config.mak
4
4
# ***************************************************************************
5
5
# Copyright (C) 2003-2006 the VideoLAN team
6
 
# $Id: bootstrap 23328 2007-11-25 20:54:07Z fkuehne $
 
6
# $Id: bootstrap 25230 2008-02-21 10:05:28Z funman $
7
7
#
8
8
# Authors: Christophe Massiot <massiot@via.ecp.fr>
9
9
#
41
41
fi
42
42
 
43
43
rm -f config.mak
44
 
echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
 
44
{
 
45
    echo "# Automatically generated by bootstrap."
 
46
    echo "# Make changes if you know what you're doing."
 
47
} > config.mak
45
48
 
46
49
if test "$HOST" != "$BUILD"; then
47
50
    CC="${HOST}-gcc"
63
66
# Makefile cross compiling is only supported with gcc-4.0
64
67
# ENVP defines the oldest environment on which the program will be able to run
65
68
# SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
66
 
            SDK_TARGET=10.4
 
69
            SDK_TARGET=10.3
67
70
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
68
71
            echo "HAVE_DARWIN_OS = 1" >> config.mak
69
72
            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
70
 
            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
 
73
            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
71
74
            CFLAGS_TUNING=" -mtune=G4"
72
75
            EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
73
76
            EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"