Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b356221be763954b45bbe4ff0c6ca3d1e1486014)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b356221be763954b45bbe4ff0c6ca3d1e1486014)
  • Date: Sun, 19 Nov 2006 06:35:34 -0600

GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

video/mplayer/HISTORY | 5 +++++
video/mplayer/Makefile.patch | 10 ++++++++++
video/mplayer/PRE_BUILD | 3 +++
3 files changed, 18 insertions(+)

New commits:
commit b356221be763954b45bbe4ff0c6ca3d1e1486014
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mplayer: patch Makefile again so it works with mplayer-fonts installed

diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 612ab7e..059687c 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2006-11-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD, Makefile.patch: brought back the part of the patch that
+ is still required, otherwise installation fails if mplayer-fonts was
+ installed
+
2006-11-06 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 1.0rc1. Removed UPDATED.
* DEPENDS: option for gtk+1, vorbis and faad updated.
diff --git a/video/mplayer/Makefile.patch b/video/mplayer/Makefile.patch
new file mode 100644
index 0000000..2d1589e
--- /dev/null
+++ b/video/mplayer/Makefile.patch
@@ -0,0 +1,10 @@
+--- Makefile~ 2006-10-23 00:32:31.000000000 +0200
++++ Makefile 2006-11-19 12:53:15.000000000 +0100
+@@ -439,7 +439,6 @@
+ done
+ endif
+ @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
+ ifeq ($(GUI),yes)
+ @$(INSTALL) -d $(DATADIR)/skins
+ @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
new file mode 100755
index 0000000..e7a7a89
--- /dev/null
+++ b/video/mplayer/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch



  • [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (b356221be763954b45bbe4ff0c6ca3d1e1486014), Arwed v. Merkatz, 11/19/2006

Archive powered by MHonArc 2.6.24.

Top of Page