← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-07-23 10:41:59 UTC
  • mfrom: (1.1.31 upstream)
  • Revision ID: james.westby@ubuntu.com-20100723104159-pudrtu70a1svhiyl
Tags: 1.1.1-1+exp1ubuntu1
* Merge from Debian experimental, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
63
63
        --enable-libass \
64
64
        --enable-libmpeg2 \
65
65
        --enable-libproxy \
 
66
        --enable-libva \
66
67
        --enable-libxml2 \
67
68
        --enable-lirc \
68
69
        --enable-live555 \
102
103
# dxva2 -> Windows only
103
104
# gnomevfs -> poorly maintained
104
105
# goom -> not in Debian
105
 
# libva -> needs a vaapi enabled avcodec
 
106
# modplug -> http://bugs.debian.org/588465
106
107
# osso_screensaver -> not targetting maemo
107
108
# portaudio -> not needed
108
109
# projectm -> broken
112
113
        --disable-dxva2 \
113
114
        --disable-gnomevfs \
114
115
        --disable-goom \
115
 
        --disable-libva \
 
116
        --disable-mod \
116
117
        --disable-osso_screensaver \
117
118
        --disable-portaudio \
118
119
        --disable-projectm \
136
137
 
137
138
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
138
139
confflags += \
139
 
       --disable-alsa \
140
 
       $(NULL)
 
140
        --disable-alsa \
 
141
        $(NULL)
141
142
endif
142
143
 
143
144
# svgalib is only for x86 and x86-64 on Linux