← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to ffmpeg/libswscale/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libswscale/Makefile
1
 
 
2
 
include ../config.mak
3
 
 
4
 
NAME=swscale
5
 
LIBVERSION=$(SWSVERSION)
6
 
LIBMAJOR=$(SWSMAJOR)
7
 
 
8
 
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
9
 
 
10
 
OBJS= swscale.o rgb2rgb.o
11
 
 
12
 
OBJS-$(TARGET_ALTIVEC)     +=  yuv2rgb_altivec.o
 
1
include $(SUBDIR)../config.mak
 
2
 
 
3
NAME = swscale
 
4
FFLIBS = avutil
 
5
 
 
6
OBJS = rgb2rgb.o swscale.o
 
7
 
13
8
OBJS-$(CONFIG_GPL)         +=  yuv2rgb.o
 
9
OBJS-$(HAVE_ALTIVEC)       +=  yuv2rgb_altivec.o
 
10
 
 
11
OBJS-$(ARCH_BFIN)          +=  swscale_bfin.o \
 
12
                               yuv2rgb_bfin.o \
 
13
 
 
14
ASM_OBJS-$(ARCH_BFIN)      += internal_bfin.o
14
15
 
15
16
HEADERS = swscale.h rgb2rgb.h
16
17
 
17
 
include ../common.mak
18
 
 
19
 
cs_test: cs_test.o $(LIB)
20
 
 
21
 
swscale-example: swscale-example.o $(LIB)
22
 
swscale-example: EXTRALIBS += -lm
23
 
 
24
 
clean::
25
 
        rm -f cs_test swscale-example
 
18
CLEANFILES = cs_test swscale-example
 
19
 
 
20
include $(SUBDIR)../subdir.mak
 
21
 
 
22
$(SUBDIR)cs_test: $(SUBDIR)cs_test.o $(SUBDIR)$(LIBNAME)
 
23
 
 
24
$(SUBDIR)swscale-example: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
 
25
$(SUBDIR)swscale-example: EXTRALIBS += -lm