← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

Viewing changes to extras/contrib/src/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-11-12 15:29:11 UTC
  • mfrom: (3.5.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091112152911-skpz5ubpg18zjedp
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc
  - backport patch "402_increase_pulseaudio_score.diff"

Show diffs side-by-side

added added

removed removed

Lines of Context:
extras/contrib/src/Makefile
149
149
X264CONF += --enable-pic
150
150
FFMPEGCONF += --cc=$(CC)
151
151
FFMPEGCONF += --arch=$(ARCH)
152
 
ifdef HAVE_DARWIN_10
 
152
ifdef HAVE_DARWIN_64
153
153
FFMPEGCONF += --cpu=core2
154
154
X264CONF+=--host=x86_64-apple-darwin10
155
155
endif
669
669
 
670
670
lua: lua-$(LUA_VERSION).tar.gz
671
671
        $(EXTRACT_GZ)
 
672
ifdef HAVE_DARWIN_OS
 
673
        (cd $@; sed -e 's%gcc%$(CC)%' -e 's%LDFLAGS=%LDFLAGS=$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  src/Makefile)
 
674
endif
672
675
 
673
676
.lua: lua
674
677
ifdef HAVE_WIN32
695
698
libmad: libmad-$(LIBMAD_VERSION).tar.gz
696
699
        $(EXTRACT_GZ)
697
700
ifdef HAVE_DARWIN_OS
698
 
        ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -i.orig  configure )
 
701
        ( cd $@; sed -e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig  configure )
699
702
endif
700
703
 
701
704
.mad: libmad
804
807
ifdef HAVE_WIN32
805
808
        patch -p0 < Patches/theora-doc.patch
806
809
endif
 
810
ifdef HAVE_DARWIN_OS
 
811
ifndef HAVE_DARWIN_10
 
812
        patch -p0 < Patches/libtheora-xcode31.patch
 
813
endif
 
814
endif
807
815
        (cd $@; autoconf)
808
816
 
809
817
THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
811
819
THEORACONF += --disable-docs
812
820
endif
813
821
 
814
 
ifdef HAVE_DARWIN_10
 
822
ifdef HAVE_DARWIN_64
815
823
THEORACONF += --disable-asm
816
824
endif
817
825
 
819
827
ifdef HAVE_BEOS
820
828
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
821
829
else
822
 
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)&& make && make install)
 
830
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
823
831
endif
824
832
        $(INSTALL_NAME)
825
833
        touch $@
1047
1055
 
1048
1056
ifdef SVN
1049
1057
ffmpeg:
1050
 
        $(SVN) co $(FFMPEG_SVN) ffmpeg
 
1058
        $(SVN) co $(FFMPEG_SVN) ffmpeg -r 20342
1051
1059
ifeq ($(HOST),i586-pc-beos)
1052
1060
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
1053
1061
endif
1061
1069
        (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
1062
1070
endif
1063
1071
ifdef HAVE_DARWIN_OS
1064
 
ifdef HAVE_DARWIN_OS_ON_INTEL
1065
 
        (cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
1066
 
else
1067
 
        (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 
1072
ifndef HAVE_DARWIN_OS_ON_INTEL
 
1073
        (cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch)
1068
1074
endif
1069
1075
endif
1070
1076
ifdef HAVE_UCLIBC
1307
1313
        (cd $@; dos2unix configure.in)
1308
1314
        patch -p0 < Patches/goom2k4-0-win32.patch
1309
1315
else
1310
 
ifndef HAVE_DARWIN_OS
1311
1316
        patch -p0 < Patches/goom2k4-0-mmx.patch
1312
1317
endif
1313
 
endif
1314
1318
        patch -p0 < Patches/goom2k4-0-memleaks.patch
1315
1319
 
1316
1320
.goom2k4: goom
1335
1339
libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
1336
1340
        $(EXTRACT_GZ)
1337
1341
ifdef HAVE_DARWIN_OS
1338
 
        #remove me at next libcaca upgrade
1339
 
        patch -p0 < Patches/libcaca_driver_cocoa.diff
1340
 
        patch -p0 < Patches/libcaca_macosx.diff
1341
1342
        patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
1342
1343
        (cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
1343
1344
endif
1390
1391
ifdef HAVE_WIN32
1391
1392
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
1392
1393
endif
1393
 
ifdef HAVE_DARWIN_OS
1394
 
        (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
1395
 
endif
1396
1394
 
1397
1395
else
1398
1396
 
1839
1837
        $(EXTRACT_BZ2)
1840
1838
 
1841
1839
.gpg-error: libgpg-error
1842
 
ifdef HAVE_DARWIN_OS_ON_INTEL
1843
 
        (cd $<; ./autogen.sh)
1844
 
endif
1845
1840
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared --disable-languages && make && make install)
1846
 
#       $(INSTALL_NAME)
 
1841
        $(INSTALL_NAME)
1847
1842
        touch $@
1848
1843
 
1849
1844
CLEAN_FILE += .gpg-error
2494
2489
libass-$(ASS_VERSION).tar.bz2:
2495
2490
        $(WGET) $(ASS_URL)
2496
2491
 
2497
 
# mplayer patches up to August 8, 2008 are included
2498
 
libass: libass-$(ASS_VERSION).tar.bz2
2499
 
        $(EXTRACT_BZ2)
2500
 
        (cd $@; patch -p1 < ../Patches/libass_mplayer_updates.patch)
2501
 
ifneq ($(HOST),$(BUILD))
2502
 
        patch -p0 < Patches/libass-cross.patch
 
2492
libass:
 
2493
        $(GIT) clone $(ASS_GIT)
2503
2494
        (cd $@; autoreconf -ivf)
2504
 
endif
2505
2495
 
2506
 
.libass: libass .png
2507
 
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
 
2496
.libass: libass .freetype
 
2497
        (cd $<; $(HOSTCC) ./configure --disable-png $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
2508
2498
        touch $@
2509
2499
 
2510
2500
CLEAN_FILE += .libass
2542
2532
ifneq ($(HOST),$(BUILD))
2543
2533
        (patch -p0 < Patches/gsm-cross.patch)
2544
2534
endif
 
2535
ifdef HAVE_DARWIN_OS
 
2536
        (cd $@; sed -e 's%-O2%-O2\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' -e 's%# LDFLAGS  =%LDFLAGS       = $(EXTRA_LDFLAGS)%' -e 's%gcc%$(CC)%' -i.orig  Makefile)
 
2537
endif
2545
2538
 
2546
2539
.gsm: gsm
2547
2540
        (cd $<; $(HOSTCC) make && cp inc/gsm.h $(PREFIX)/include && cp lib/libgsm.a  $(PREFIX)/lib)