Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 77047 by Arwed von Merkatz for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "Benoit Papillault" <benoit.papillault AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 77047 by Arwed von Merkatz for review
  • Date: Thu, 30 Mar 2006 22:50:04 +0100 (BST)

Change 77047 by arwed_von_merkatz@arwed-Otherland on 2006/03/30 22:47:45

fixed Makefile patch

Affected files ...

... //sgl/grimoires/stable-rc/0.4/video/mplayer/HISTORY#3 integrate
... //sgl/grimoires/stable-rc/0.4/video/mplayer/cvs.Makefile.patch#2 integrate
... //sgl/grimoires/stable/0.3/video/mplayer/HISTORY#3 integrate
... //sgl/grimoires/stable/0.3/video/mplayer/cvs.Makefile.patch#2 integrate

Differences ...

==== //sgl/grimoires/stable-rc/0.4/video/mplayer/HISTORY#3 (text) ====

@@ -1,3 +1,6 @@
+2006-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * cvs.Makefile.patch: updated
+
2006-03-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, Makefile.patch, cvs.Makefile.patch: Makefile.patch
doesn't
apply to cvs anymore, made seperate one for cvs and release

==== //sgl/grimoires/stable-rc/0.4/video/mplayer/cvs.Makefile.patch#2 (text)
====

@@ -1,14 +1,14 @@
---- Makefile~ 2006-03-01 15:02:34.000000000 +0100
-+++ Makefile 2006-03-01 15:04:39.000000000 +0100
-@@ -476,11 +476,6 @@
+--- Makefile~ 2006-03-30 18:56:17.000000000 +0200
++++ Makefile 2006-03-30 20:53:15.000000000 +0200
+@@ -492,11 +492,6 @@
done
endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+ @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
- @if test ! -f $(DATADIR)/font/font.desc ; then \
- echo "*** Download font at http://www.mplayerhq.hu/dload.html"; ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
- fi
ifeq ($(GUI),yes)
- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
+ @$(INSTALL) -d $(DATADIR)/skins
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";

==== //sgl/grimoires/stable/0.3/video/mplayer/HISTORY#3 (text) ====

@@ -1,3 +1,6 @@
+2006-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * cvs.Makefile.patch: updated
+
2006-03-01 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, Makefile.patch, cvs.Makefile.patch: Makefile.patch
doesn't
apply to cvs anymore, made seperate one for cvs and release

==== //sgl/grimoires/stable/0.3/video/mplayer/cvs.Makefile.patch#2 (text) ====

@@ -1,14 +1,14 @@
---- Makefile~ 2006-03-01 15:02:34.000000000 +0100
-+++ Makefile 2006-03-01 15:04:39.000000000 +0100
-@@ -476,11 +476,6 @@
+--- Makefile~ 2006-03-30 18:56:17.000000000 +0200
++++ Makefile 2006-03-30 20:53:15.000000000 +0200
+@@ -492,11 +492,6 @@
done
endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+ @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
- @if test ! -f $(DATADIR)/font/font.desc ; then \
- echo "*** Download font at http://www.mplayerhq.hu/dload.html"; ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/"
; \
- fi
ifeq ($(GUI),yes)
- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
+ @$(INSTALL) -d $(DATADIR)/skins
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html";



  • [SM-Commit] PERFORCE change 77047 by Arwed von Merkatz for review, Perforce Review Daemon, 03/30/2006

Archive powered by MHonArc 2.6.24.

Top of Page