openbsd-ports/x11/mplayer/patches/patch-Makefile
biorn 7a365f9f2c Take it to 1.0pre4
ok brad@
2004-05-06 07:27:36 +00:00

22 lines
1.2 KiB
Plaintext

$OpenBSD: patch-Makefile,v 1.8 2004/05/06 07:27:49 biorn Exp $
--- Makefile.orig 2004-04-13 13:22:37.000000000 +0200
+++ Makefile 2004-04-28 12:24:12.000000000 +0200
@@ -229,7 +229,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
ifeq ($(MENCODER),yes)
$(PRG_MENCODER): $(MENCODER_DEP)
./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
- $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm
+ $(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm
endif
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
@@ -287,8 +287,6 @@ ifeq ($(GUI),yes)
@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
endif
- @if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
ifeq ($(DVDKIT_SHARED),yes)
ifeq ($(DVDKIT2),yes)
if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi