Author: pebender
Date: Mon Feb 16 15:34:49 2009
New Revision: 4402
Added:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-17385.28617.patch.gar
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28617.17385.1168-x11_headers.patch
Removed:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-16984.28461.patch.gar
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28461.16984.1167-vdpau_mplayer_3482714.patch
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28461.16984.1167-x11_headers.patch
Modified:
trunk/gar-minimyth/script/lib/ffmpeg/Makefile
trunk/gar-minimyth/script/lib/ffmpeg/checksums
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
Log:
- Updated package lib/ffmpeg and mediaplayers/mplayer-svn.
Modified: trunk/gar-minimyth/script/lib/ffmpeg/Makefile
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/Makefile (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/Makefile Mon Feb 16 15:34:49 2009
@@ -1,5 +1,5 @@
GARNAME = ffmpeg
-GARVERSION = 16984.28461
+GARVERSION = 17385.28617
CATEGORIES = lib
MASTER_SITES = svn://svn.ffmpeg.org/
DISTFILES = $(DISTNAME).tar.bz2
@@ -47,7 +47,6 @@
--disable-w32threads \
--enable-x11grab \
--enable-vdpau \
- --enable-xvmc \
--enable-network \
--disable-ipv6 \
--disable-mpegaudio-hp \
@@ -84,6 +83,7 @@
--disable-libgsm \
--disable-libmp3lame \
--disable-libnut \
+ --disable-libopenjpeg \
--disable-libschroedinger \
--disable-libspeex \
--disable-libtheora \
@@ -110,6 +110,7 @@
--cpu=$(GARCH) \
--disable-powerpc-perf \
--disable-altivec \
+ --enable-amd3dnow \
--enable-mmx \
--enable-mmx2 \
--enable-sse \
@@ -122,6 +123,7 @@
--disable-mmi \
--disable-neon \
--disable-vis \
+ --enable-yasm \
--disable-debug \
--disable-gprof \
--enable-optimizations \
Modified: trunk/gar-minimyth/script/lib/ffmpeg/checksums
==============================================================================
--- trunk/gar-minimyth/script/lib/ffmpeg/checksums (original)
+++ trunk/gar-minimyth/script/lib/ffmpeg/checksums Mon Feb 16 15:34:49 2009
@@ -1 +1 @@
-c9804a7a7cfcda442bbb87761655d53d download/ffmpeg-16984.28461.patch.gar
+740effd16a466bc322f4ac452bfc158c download/ffmpeg-17385.28617.patch.gar
Added:
trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-17385.28617.patch.gar
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/lib/ffmpeg/files/ffmpeg-17385.28617.patch.gar
Mon Feb 16 15:34:49 2009
@@ -0,0 +1,399 @@
+diff -Naur ffmpeg-17385.28617-old/configure
ffmpeg-17385.28617-new/configure
+--- ffmpeg-17385.28617-old/configure 2009-02-16 14:22:11.000000000 -0800
++++ ffmpeg-17385.28617-new/configure 2009-02-16 14:23:09.000000000 -0800
+@@ -708,11 +708,11 @@
+ func=$4
+ shift 4
+ disable $cfg
+- check_cmd ${pkg}-config --version
++ check_cmd @GAR_DESTDIR@@GAR_bindir@/${pkg}-config --version
+ err=$?
+ if test "$err" = 0; then
+- temp_cflags `${pkg}-config --cflags`
+- temp_extralibs `${pkg}-config --libs`
++ temp_cflags `...@gar_destdir@@GAR_bindir@/${pkg}-config --cflags`
++ temp_extralibs `...@gar_destdir@@GAR_bindir@/${pkg}-config --libs`
+ check_lib "$@" $header $func && enable $cfg
+ fi
+ return $err
+@@ -1994,7 +1994,7 @@
+
+ disable sdl_too_old
+ disable sdl
+-SDL_CONFIG="${cross_prefix}sdl-config"
++SDL_CONFIG="${SDL_CONFIG:-...@gar_destdir@@GAR_bindir@/sdl-config}"
+ if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
+ sdl_cflags=`"${SDL_CONFIG}" --cflags`
+ temp_cflags $sdl_cflags
+diff -Naur ffmpeg-17385.28617-old/Makefile ffmpeg-17385.28617-new/Makefile
+--- ffmpeg-17385.28617-old/Makefile 2009-02-16 14:22:11.000000000 -0800
++++ ffmpeg-17385.28617-new/Makefile 2009-02-16 14:23:09.000000000 -0800
+@@ -91,11 +91,11 @@
+
+ HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS)
$(HOOKS-yes)))
+
+-VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
+-LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++VHOOKCFLAGS-$(HAVE_IMLIB2) += `...@gar_destdir@@GAR_bindir@/imlib2-config
--cflags`
++LIBS_imlib2$(SLIBSUF) = `...@gar_destdir@@GAR_bindir@/imlib2-config
--libs`
+
+-VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
+-LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++VHOOKCFLAGS-$(HAVE_FREETYPE2) +=
`...@gar_destdir@@GAR_bindir@/freetype-config --cflags`
++LIBS_drawtext$(SLIBSUF) =
`...@gar_destdir@@GAR_bindir@/freetype-config --libs`
+
+ VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
+
+diff -Naur ffmpeg-17385.28617-old/Makefile.orig
ffmpeg-17385.28617-new/Makefile.orig
+--- ffmpeg-17385.28617-old/Makefile.orig 1969-12-31 16:00:00.000000000
-0800
++++ ffmpeg-17385.28617-new/Makefile.orig 2009-02-16 14:23:09.000000000
-0800
+@@ -0,0 +1,349 @@
++include config.mak
++
++SRC_DIR = $(SRC_PATH_BARE)
++
++vpath %.texi $(SRC_PATH_BARE)
++
++PROGS-$(CONFIG_FFMPEG) += ffmpeg
++PROGS-$(CONFIG_FFPLAY) += ffplay
++PROGS-$(CONFIG_FFSERVER) += ffserver
++
++PROGS = $(addsuffix $(EXESUF), $(PROGS-yes))
++PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes))
++OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o
++MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
++
++BASENAMES = ffmpeg ffplay ffserver
++ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES))
++ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES))
++ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
++
++FFLIBS-$(CONFIG_AVFILTER) += avfilter
++FFLIBS-$(CONFIG_POSTPROC) += postproc
++FFLIBS-$(CONFIG_SWSCALE) += swscale
++
++FFLIBS := avdevice avformat avcodec avutil
++
++DATA_FILES := $(wildcard $(SRC_DIR)/ffpresets/*.ffpreset)
++
++include common.mak
++
++FF_LDFLAGS := $(FFLDFLAGS)
++FF_EXTRALIBS := $(FFEXTRALIBS)
++FF_DEP_LIBS := $(DEP_LIBS)
++
++ALL_TARGETS-$(CONFIG_VHOOK) += videohook
++ALL_TARGETS-$(BUILD_DOC) += documentation
++
++INSTALL_TARGETS-$(CONFIG_VHOOK) += install-vhook
++ifneq ($(PROGS),)
++INSTALL_TARGETS-yes += install-progs install-data
++INSTALL_TARGETS-$(BUILD_DOC) += install-man
++endif
++INSTALL_PROGS_TARGETS-$(BUILD_SHARED) = install-libs
++
++all: $(FF_DEP_LIBS) $(PROGS) $(ALL_TARGETS-yes)
++
++$(PROGS): %$(EXESUF): %_g$(EXESUF)
++ cp -p $< $@
++ $(STRIP) $@
++
++SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTS
++
++define RESET
++$(1) :=
++$(1)-yes :=
++endef
++
++define DOSUBDIR
++$(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
++SUBDIR := $(1)/
++include $(1)/Makefile
++endef
++
++$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
++
++ffplay_g$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS)
++ffserver_g$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS)
++
++%_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS)
++ $(CC) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS)
++
++output_example$(EXESUF): output_example.o $(FF_DEP_LIBS)
++ $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
++
++tools/%$(EXESUF): tools/%.c
++ $(CC) $(CFLAGS) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
++
++ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)
++
++alltools: $(addsuffix $(EXESUF),$(addprefix tools/, cws2fws pktdumper
qt-faststart trasher))
++
++VHOOKCFLAGS += $(filter-out -mdynamic-no-pic,$(CFLAGS))
++
++BASEHOOKS = fish null watermark
++ALLHOOKS = $(BASEHOOKS) drawtext imlib2 ppm
++ALLHOOKS_SRCS = $(addprefix vhook/, $(addsuffix .c, $(ALLHOOKS)))
++
++HOOKS-$(HAVE_FORK) += ppm
++HOOKS-$(HAVE_IMLIB2) += imlib2
++HOOKS-$(HAVE_FREETYPE2) += drawtext
++
++HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS)
$(HOOKS-yes)))
++
++VHOOKCFLAGS-$(HAVE_IMLIB2) += `imlib2-config --cflags`
++LIBS_imlib2$(SLIBSUF) = `imlib2-config --libs`
++
++VHOOKCFLAGS-$(HAVE_FREETYPE2) += `freetype-config --cflags`
++LIBS_drawtext$(SLIBSUF) = `freetype-config --libs`
++
++VHOOKCFLAGS += $(VHOOKCFLAGS-yes)
++
++vhook/%.o vhook/%.d: CFLAGS:=$(VHOOKCFLAGS)
++
++# vhooks compile fine without libav*, but need them nonetheless.
++videohook: $(FF_DEP_LIBS) $(HOOKS)
++
++$(eval VHOOKSHFLAGS=$(VHOOKSHFLAGS))
++vhook/%$(SLIBSUF): vhook/%.o
++ $(CC) $(LDFLAGS) -o $@ $(VHOOKSHFLAGS) $< $(VHOOKLIBS) $(LIBS_$(@F))
++
++VHOOK_DEPS = $(HOOKS:$(SLIBSUF)=.d)
++depend dep: $(VHOOK_DEPS)
++
++documentation: $(addprefix doc/, ffmpeg-doc.html faq.html
ffserver-doc.html \
++ ffplay-doc.html general.html hooks.html \
++ $(ALLMANPAGES))
++
++doc/%.html: doc/%.texi
++ texi2html -monolithic -number $<
++ mv $(@F) $@
++
++doc/%.pod: doc/%-doc.texi
++ doc/texi2pod.pl $< $@
++
++doc/%.1: doc/%.pod
++ pod2man --section=1 --center=" " --release=" " $< > $@
++
++install: $(INSTALL_TARGETS-yes)
++
++install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
++ install -d "$(BINDIR)"
++ install -c -m 755 $(PROGS) "$(BINDIR)"
++
++install-data: $(DATA_FILES)
++ install -d "$(DATADIR)"
++ install -m 644 $(DATA_FILES) "$(DATADIR)"
++
++install-man: $(MANPAGES)
++ install -d "$(MANDIR)/man1"
++ install -m 644 $(MANPAGES) "$(MANDIR)/man1"
++
++install-vhook: videohook
++ install -d "$(SHLIBDIR)/vhook"
++ install -m 755 $(HOOKS) "$(SHLIBDIR)/vhook"
++
++uninstall: uninstall-progs uninstall-data uninstall-man uninstall-vhook
++
++uninstall-progs:
++ rm -f $(addprefix "$(BINDIR)/", $(ALLPROGS))
++
++uninstall-data:
++ rm -rf "$(DATADIR)"
++
++uninstall-man:
++ rm -f $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
++
++uninstall-vhook:
++ rm -f $(addprefix "$(SHLIBDIR)/",$(ALLHOOKS_SRCS:.c=$(SLIBSUF)))
++ -rmdir "$(SHLIBDIR)/vhook/"
++
++testclean:
++ rm -rf tests/vsynth1 tests/vsynth2 tests/data tests/asynth1.sw tests/*~
++
++clean:: testclean
++ rm -f $(ALLPROGS) $(ALLPROGS_G) output_example$(EXESUF)
++ rm -f doc/*.html doc/*.pod doc/*.1
++ rm -f $(addprefix tests/,$(addsuffix $(EXESUF),audiogen videogen
rotozoom seek_test tiny_psnr))
++ rm -f $(addprefix tools/,$(addsuffix $(EXESUF),cws2fws pktdumper
qt-faststart trasher))
++ rm -f vhook/*.o vhook/*~ vhook/*.so vhook/*.dylib vhook/*.dll
++
++distclean::
++ rm -f version.h config.* vhook/*.d
++
++# regression tests
++
++check: test checkheaders
++
++fulltest test: codectest libavtest seektest
++
++FFMPEG_REFFILE = $(SRC_PATH)/tests/ffmpeg.regression.ref
++FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
++LIBAV_REFFILE = $(SRC_PATH)/tests/libav.regression.ref
++ROTOZOOM_REFFILE = $(SRC_PATH)/tests/rotozoom.regression.ref
++SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref
++
++CODEC_TESTS = $(addprefix regtest-, \
++ mpeg \
++ mpeg2 \
++ mpeg2thread \
++ msmpeg4v2 \
++ msmpeg4 \
++ wmv1 \
++ wmv2 \
++ h261 \
++ h263 \
++ h263p \
++ mpeg4 \
++ huffyuv \
++ rc \
++ mpeg4adv \
++ mpeg4thread \
++ error \
++ mpeg4nr \
++ mpeg1b \
++ mjpeg \
++ ljpeg \
++ jpegls \
++ rv10 \
++ rv20 \
++ asv1 \
++ asv2 \
++ flv \
++ ffv1 \
++ snow \
++ snowll \
++ dv \
++ dv50 \
++ svq1 \
++ flashsv \
++ mp2 \
++ ac3 \
++ g726 \
++ adpcm_ima_wav \
++ adpcm_ima_qt \
++ adpcm_ms \
++ adpcm_yam \
++ adpcm_swf \
++ flac \
++ wma \
++ pcm \
++ )
++
++LAVF_TESTS = $(addprefix regtest-, \
++ avi \
++ asf \
++ rm \
++ mpg \
++ ts \
++ swf \
++ ffm \
++ flv_fmt \
++ mov \
++ dv_fmt \
++ gxf \
++ nut \
++ mkv \
++ pbmpipe \
++ pgmpipe \
++ ppmpipe \
++ gif \
++ yuv4mpeg \
++ pgm \
++ ppm \
++ bmp \
++ tga \
++ tiff \
++ sgi \
++ jpg \
++ wav \
++ alaw \
++ mulaw \
++ au \
++ mmf \
++ aiff \
++ voc \
++ ogg \
++ pixfmt \
++ )
++
++REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%)))
++
++CODEC_ROTOZOOM = $(call REGFILES,rotozoom.regression,$(CODEC_TESTS))
++CODEC_VSYNTH = $(call REGFILES,vsynth.regression,$(CODEC_TESTS))
++
++LAVF_REGFILES = $(call REGFILES,lavf.regression,$(LAVF_TESTS))
++
++LAVF_REG = tests/data/lavf.regression
++ROTOZOOM_REG = tests/data/rotozoom.regression
++VSYNTH_REG = tests/data/vsynth.regression
++
++ifneq ($(CONFIG_SWSCALE),yes)
++servertest codectest $(CODEC_TESTS) libavtest: swscale_error
++swscale_error:
++ @echo
++ @echo "This regression test requires --enable-swscale."
++ @echo
++ @exit 1
++endif
++
++codectest: $(VSYNTH_REG) $(ROTOZOOM_REG)
++ diff -u -w $(FFMPEG_REFFILE) $(VSYNTH_REG)
++ diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG)
++
++libavtest: $(LAVF_REG)
++ diff -u -w $(LIBAV_REFFILE) $(LAVF_REG)
++
++$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG):
++ cat $^ > $@
++
++$(LAVF_REG): $(LAVF_REGFILES)
++$(ROTOZOOM_REG): $(CODEC_ROTOZOOM)
++$(VSYNTH_REG): $(CODEC_VSYNTH)
++
++$(CODEC_VSYNTH) $(CODEC_ROTOZOOM): $(CODEC_TESTS)
++
++$(LAVF_REGFILES): $(LAVF_TESTS)
++
++$(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
++
++regtest-ref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
tests/asynth1.sw
++
++$(CODEC_TESTS) regtest-ref: tests/tiny_psnr$(EXESUF)
++ $(SRC_PATH)/tests/regression.sh $@ vsynth tests/vsynth1
a "$(TARGET_EXEC)" "$(TARGET_PATH)"
++ $(SRC_PATH)/tests/regression.sh $@ rotozoom tests/vsynth2
a "$(TARGET_EXEC)" "$(TARGET_PATH)"
++
++$(LAVF_TESTS):
++ $(SRC_PATH)/tests/regression.sh $@ lavf tests/vsynth1
b "$(TARGET_EXEC)" "$(TARGET_PATH)"
++
++seektest: codectest libavtest tests/seek_test$(EXESUF)
++ $(SRC_PATH)/tests/seek_test.sh
$(SEEK_REFFILE) "$(TARGET_EXEC)" "$(TARGET_PATH)"
++
++servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
++ @echo
++ @echo "Unfortunately ffserver is broken and therefore its regression"
++ @echo "test fails randomly. Treat the results accordingly."
++ @echo
++ $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE)
$(SRC_PATH)/tests/test.conf
++
++tests/vsynth1/00.pgm: tests/videogen$(EXESUF)
++ mkdir -p tests/vsynth1
++ $(BUILD_ROOT)/$< 'tests/vsynth1/'
++
++tests/vsynth2/00.pgm: tests/rotozoom$(EXESUF)
++ mkdir -p tests/vsynth2
++ $(BUILD_ROOT)/$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
++
++tests/asynth1.sw: tests/audiogen$(EXESUF)
++ $(BUILD_ROOT)/$< $@
++
++tests/%$(EXESUF): tests/%.c
++ $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $< $(HOSTLIBS)
++
++tests/seek_test$(EXESUF): tests/seek_test.c $(FF_DEP_LIBS)
++ $(CC) $(FF_LDFLAGS) $(CFLAGS) -o $@ $< $(FF_EXTRALIBS)
++
++
++.PHONY: lib videohook documentation *test regtest-* swscale-error
alltools check
++
++-include $(VHOOK_DEPS)
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile (original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/Makefile Mon Feb 16
15:34:49 2009
@@ -1,9 +1,9 @@
GARNAME = MPlayer
-GARVERSION = 28461.16984.1167
+GARVERSION = 28617.17385.1168
CATEGORIES = mediaplayers
MASTER_SITES = svn://svn.mplayerhq.hu/
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-vdpau_mplayer_3482714.patch
$(DISTNAME)-x11_headers.patch
+PATCHFILES = $(DISTNAME)-x11_headers.patch
LICENSE = mplayer
mplayer_LICENSE_TEXT = $(WORKSRC)/Copyright
Modified: trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
==============================================================================
--- trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums
(original)
+++ trunk/gar-minimyth/script/mediaplayers/mplayer-svn/checksums Mon Feb
16
15:34:49 2009
@@ -1,2 +1 @@
-1aef660f147a298467be57ae4d872170
download/MPlayer-28461.16984.1167-vdpau_mplayer_3482714.patch
-a04773aa9c82848173ea239da453ff40
download/MPlayer-28461.16984.1167-x11_headers.patch
+24fe00c7f5edc5dce568f18ed19dc449
download/MPlayer-28617.17385.1168-x11_headers.patch
Added:
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28617.17385.1168-x11_headers.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/mediaplayers/mplayer-svn/files/MPlayer-28617.17385.1168-x11_headers.patch
Mon Feb 16 15:34:49 2009
@@ -0,0 +1,42 @@
+diff -Naur MPlayer-28617.17385.1168-old/configure
MPlayer-28617.17385.1168-new/configure
+--- MPlayer-28617.17385.1168-old/configure 2009-02-16 14:26:54.000000000
-0800
++++ MPlayer-28617.17385.1168-new/configure 2009-02-16 14:29:41.000000000
-0800
+@@ -4136,23 +4136,23 @@
+ echocheck "X11 headers presence"
+ _x11_headers="no"
+ _res_comment="check if the dev(el) packages are installed"
+- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
++# for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
+ _x11_headers="yes"
+ _res_comment=""
+- break
+- fi
+- done
+- if test $_cross_compile = no; then
+- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
+- if test -f "$I/X11/Xlib.h" ; then
+- _inc_extra="$_inc_extra -I$I"
+- _x11_headers="yes"
+- _res_comment="using $I"
+- break
+- fi
+- done
+- fi
++# break
++# fi
++# done
++# if test $_cross_compile = no; then
++# for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6
/usr/openwin/include ; do
++# if test -f "$I/X11/Xlib.h" ; then
++# _inc_extra="$_inc_extra -I$I"
++# _x11_headers="yes"
++# _res_comment="using $I"
++# break
++# fi
++# done
++# fi
+ echores "$_x11_headers"
+
+
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
