[SM-Commit] GIT changes to master grimoire by Pol Vinogradov (d8308d17aef514ab999f738e7551a48589b711c9)

Pol Vinogradov scm at mail.sourcemage.org
Thu Feb 15 14:40:09 EST 2007


GIT changes to master grimoire by Pol Vinogradov <vin.public at gmail.com>:

 net/iproute2/BUILD     |    6 +++---
 net/iproute2/HISTORY   |    4 ++++
 net/iproute2/PRE_BUILD |    4 +++-
 net/iproute2/doc.patch |   11 -----------
 video/mplayer/BUILD    |    2 +-
 video/mplayer/DEPENDS  |    4 ++++
 video/mplayer/DETAILS  |    7 +++++--
 video/mplayer/HISTORY  |    5 +++++
 8 files changed, 25 insertions(+), 18 deletions(-)

New commits:
commit 8686a6cb0363e88da14ae3b2feb21b9493db333b
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    net/iproute2:
    
    BUILD: changed doc dir to be more smgl specific
    PRE_BUILD: added two more sedits for install_rootifying. switched to
    sedit from doc.patch
    doc.patch: removed, not needed anymore

commit 338e0e0c255280d42a34c65c04a1f6b6962eedbe
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    video/mplayer:
    
    BUILD: track_rootifying
    DEPENDS: added openal as optional_depends
    DETAILS: cut lines to <= 80 characters length

diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index a81f4f7..5807b35 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -19,8 +19,8 @@ if ! test -e ip/ip ; then
 fi  &&
 
 if  [  "$BUILD_DOCS"  =  y  ];  then
-  cd $SOURCE_DIRECTORY/doc                    &&
-  make                                        &&
-  mkdir -p /usr/share/doc/iproute2            &&
+  cd $SOURCE_DIRECTORY/doc                         &&
+  make                                             &&
+  mkdir -p ${INSTALL_ROOT}/usr/share/doc/${SPELL}  &&
   cd $SOURCE_DIRECTORY
 fi
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 458c42d..7e08ef4 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,5 +1,9 @@
 2007-02-15 Pol Vinogradov <vin.public at gmail.com>
 	* DETAILS: updated to 2.6.19-061214
+	* BUILD: changed doc dir to be more smgl specific
+	* PRE_BUILD: added two more sedits for install_rootifying. switched to
+	  sedit from doc.patch
+	* doc.patch: removed, not needed anymore
 
 2006-12-05 Eric Sandall <eric at sandall.us>
 	* DETAILS: Updated to 2.6.18-061002
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 969a2b1..929e95c 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -4,12 +4,14 @@ cd  $SOURCE_DIRECTORY  &&
 sedit  "s/-O2/$CFLAGS/"  Makefile                             &&
 sedit  's/-g//'  Makefile                                     &&
 sedit  "s!^CFLAGS =!& -include ${PWD}/sctpfix.h !"  Makefile  &&
+sedit  "s:/usr:${INSTALL_ROOT}/usr:g"  Makefile               &&
+sedit  "s:/etc:${INSTALL_ROOT}/etc:g"  Makefile               &&
 
 #
 # Fix document install directory
 #
 if  [  "$BUILD_DOCS"  =  y  ];  then
-  patch  -p1  <  $SCRIPT_DIRECTORY/doc.patch
+  sedit "s:PAGESPERPAGE=2:PAGESPERPAGE=2\nDOCDIR=${INSTALL_ROOT}/usr/share/doc/${SPELL}:" doc/Makefile
 fi  &&
 
 #
diff --git a/net/iproute2/doc.patch b/net/iproute2/doc.patch
deleted file mode 100644
index baf2ac5..0000000
--- a/net/iproute2/doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urpN iproute2-2.6.8.orig/doc/Makefile iproute2-2.6.8/doc/Makefile
---- iproute2-2.6.8.orig/doc/Makefile	2004-08-20 07:15:45.300846296 -0700
-+++ iproute2-2.6.8/doc/Makefile	2004-08-20 07:20:21.027929408 -0700
-@@ -12,6 +12,7 @@ LPR=lpr -Zsduplex
- SHELL=bash
- PAGESIZE=a4
- PAGESPERPAGE=2
-+DOCDIR=/usr/share/doc/iproute2
- 
- HTMLFILES=$(subst .sgml,.html,$(shell echo *.sgml))
- DVIFILES=$(subst .ps,.dvi,$(PSFILES))
diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 69dbfb2..1a07763 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -1,5 +1,5 @@
 if [[ $MPLAYER_SVN = y ]]; then
-  OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
+  OPTS="$OPTS --with-extraincdir=${TRACK_ROOT}/usr/include/ffmpeg"
 fi  &&
 
 OPTS="$MPLAYER_OPTS $OPTS"  &&
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index f96720a..261e77a 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -87,6 +87,10 @@ optional_depends  enca \
 			  "" \
 			  "--disable-enca" \
 			  "for ENCA charset oracle library"          &&
+optional_depends  openal \
+			  "" \
+			  "--disable-openal" \
+			  "for OpenAL sound support"  &&
 optional_depends  samba \
 			  "--enable-smb" \
 			  "" \
diff --git a/video/mplayer/DETAILS b/video/mplayer/DETAILS
index 4dcdd00..397afb7 100755
--- a/video/mplayer/DETAILS
+++ b/video/mplayer/DETAILS
@@ -40,6 +40,9 @@ It works with X11, Xv, DGA, OpenGL, SVGA
 without X!), and some lowlevel card-specific drivers (for Matrox, 3Dfx and
 Radeon) too! Most of them supports software or hardware scaling, so you can
 enjoy movies in fullscreen.
-MPlayer supports displaying through some hardware MPEG decoder boards, such as the DVB and  DXR3/Hollywood+ !
-And what about the nice big antialiased shaded subtitles (9 supported types!!!) with european/ISO 8859-1,2 (hungarian, english, czech, etc), cyrillic, korean fonts, and OSD? 
+MPlayer supports displaying through some hardware MPEG decoder boards, such as
+the DVB and  DXR3/Hollywood+ !
+And what about the nice big antialiased shaded subtitles (9 supported
+types!!!) with european/ISO 8859-1,2 (hungarian, english, czech, etc),
+cyrillic, korean fonts, and OSD? 
 EOF
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 9760aa6..1036f63 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2007-02-15 Pol Vinogradov <vin.public at gmail.com>
+	* BUILD: track_rootifying
+	* DEPENDS: added openal as optional_depends
+	* DETAILS: cut lines to <= 80 characters length
+
 2007-02-13 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* PRE_BUILD: only apply patch for stable mplayer, not for svn version
 	* DEPENDS: don't pass --enable-live to svn version as that breaks it



More information about the SM-Commit mailing list