projects / packages / mplayer.git / blame
| Commit | Line | Data |
|---|---|---|
| 3e4bd1a8 | 1 | --- mplayer-r32669/configure.orig 2012-03-03 23:31:28.000000000 +0000 |
| 2 | +++ mplayer-r32669/configure 2012-03-10 12:19:51.000000000 +0000 | |
| 3 | @@ -593,7 +593,8 @@ | |
| d8c0ce26 | 4 | |
| 5 | Use these options if autodetection fails: | |
| 6 | --extra-cflags=FLAGS extra CFLAGS | |
| 7 | - --extra-ldflags=FLAGS extra LDFLAGS | |
| 8 | + --real-ldflags=FLAGS LDFLAGS | |
| 9 | + --extra-ldflags=FLAGS extra LIBS ! | |
| 10 | --extra-libs=FLAGS extra linker flags | |
| 11 | --extra-libs-mplayer=FLAGS extra linker flags for MPlayer | |
| 12 | --extra-libs-mencoder=FLAGS extra linker flags for MEncoder | |
| 3e4bd1a8 | 13 | @@ -929,6 +930,9 @@ |
| d8c0ce26 | 14 | --extra-cflags=*) |
| 15 | extra_cflags=$(echo $ac_option | cut -d '=' -f 2-) | |
| 16 | ;; | |
| 17 | + --real-ldflags=*) | |
| 18 | + real_ldflags=$(echo $ac_option | cut -d '=' -f 2-) | |
| 19 | + ;; | |
| 20 | --extra-ldflags=*) | |
| 21 | extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-) | |
| 22 | ;; | |
| 3e4bd1a8 | 23 | @@ -7590,7 +7594,7 @@ |
| 155b406c PS |
24 | |
| 25 | echocheck "compiler support for noexecstack" | |
| 26 | if cflag_check -Wl,-z,noexecstack ; then | |
| d8c0ce26 | 27 | - extra_ldflags="-Wl,-z,noexecstack $extra_ldflags" |
| 28 | + real_ldflags="-Wl,-z,noexecstack $real_ldflags" | |
| 29 | echores "yes" | |
| 30 | else | |
| 31 | echores "no" | |
| 3e4bd1a8 | 32 | @@ -7988,6 +7992,8 @@ |
| 427af63d AM |
33 | CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper |
| 34 | CFLAGS_TREMOR_LOW = $cflags_tremor_low | |
| d8c0ce26 | 35 | |
| 427af63d | 36 | +LDFLAGS = $real_ldflags |
| 3e4bd1a8 | 37 | + |
| 38 | EXTRALIBS = $extra_ldflags $ld_static $extra_libs | |
| 427af63d | 39 | EXTRALIBS_MPLAYER = $libs_mplayer |
| d8c0ce26 | 40 | EXTRALIBS_MENCODER = $libs_mencoder |
| 155b406c PS |
41 | --- mplayer-r32669/Makefile.orig 2010-10-27 19:55:45.000000000 +0200 |
| 42 | +++ mplayer-r32669/Makefile 2010-11-30 09:24:31.973414915 +0100 | |
| 43 | @@ -853,7 +853,7 @@ | |
| d8c0ce26 | 44 | mplayer$(EXESUF): $(MPLAYER_DEPS) |
| 45 | mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER) | |
| 46 | mencoder$(EXESUF) mplayer$(EXESUF): | |
| 47 | - $(CC) -o $@ $^ $(EXTRALIBS) | |
| 48 | + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) | |
| 49 | ||
| 155b406c PS |
50 | codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h |
| 51 | $(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $< | |
| 52 | @@ -1072,7 +1072,7 @@ | |
| d8c0ce26 | 53 | TOOLS/netstream$(EXESUF): TOOLS/netstream.c |
| 54 | TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c | |
| 55 | TOOLS/netstream$(EXESUF) TOOLS/vivodump$(EXESUF): $(subst mplayer.o,mplayer-nomain.o,$(OBJS_MPLAYER)) $(filter-out %mencoder.o,$(OBJS_MENCODER)) $(OBJS_COMMON) $(COMMON_LIBS) | |
| 155b406c PS |
56 | - $(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS) |
| 57 | + $(CC) $(CC_DEPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS_MPLAYER) $(EXTRALIBS_MENCODER) $(EXTRALIBS) | |
| d8c0ce26 | 58 | |
| 59 | REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c) | |
| 60 | REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0) |