f5271b838d
Don't depend on ogg/vorbis as it's built in now Put fontconfig and freetype in WANTLIB and BUILD_DEPEND on pkgconfig if FLAVOR is not no_x11.
22 lines
1.2 KiB
Plaintext
22 lines
1.2 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.11 2005/05/09 12:24:38 biorn Exp $
|
|
--- Makefile.orig Sat Apr 16 22:18:12 2005
|
|
+++ Makefile Wed Apr 20 06:35:54 2005
|
|
@@ -259,7 +259,7 @@ mplayer_wine.so: $(MPLAYER_DEP)
|
|
|
|
ifeq ($(MENCODER),yes)
|
|
$(PRG_MENCODER): $(MENCODER_DEP)
|
|
- $(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) $(MATH_LIB)
|
|
+ $(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) $(MATH_LIB)
|
|
endif
|
|
|
|
codecs.conf.h: $(PRG_CFG) etc/codecs.conf
|
|
@@ -325,8 +325,6 @@ ifeq ($(GUI),yes)
|
|
@if test ! -d $(prefix)/share/applications ; then mkdir -p $(prefix)/share/applications ; fi
|
|
$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
|
|
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
|