Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c5caff417f7c1bf7fce372d5849e7f903a8d2df1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c5caff417f7c1bf7fce372d5849e7f903a8d2df1)
  • Date: Sun, 4 Nov 2012 15:47:15 -0600

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

video/mplayer2/BUILD | 6 +++++-
video/mplayer2/CONFIGURE | 8 +++++---
video/mplayer2/DEPENDS | 17 +++++++++--------
video/mplayer2/HISTORY | 4 ++++
video/mplayer2/INSTALL | 5 +++++
5 files changed, 28 insertions(+), 12 deletions(-)

New commits:
commit c5caff417f7c1bf7fce372d5849e7f903a8d2df1
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

video/mplayer2: fixed scm branch build

diff --git a/video/mplayer2/BUILD b/video/mplayer2/BUILD
index 8574d6b..03151de 100755
--- a/video/mplayer2/BUILD
+++ b/video/mplayer2/BUILD
@@ -1,6 +1,10 @@
#disable_pic &&

-OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS" &&
+if [ "$MPLAYER2_BRANCH" != "scm" ]; then
+ OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS"
+else
+ OPTS="$MPLAYER_OPTS $OPTS"
+fi &&

if [ "$MPLAYER2_BRANCH" == "scm" ]; then
local PYVER=$(installed_version python3) &&
diff --git a/video/mplayer2/CONFIGURE b/video/mplayer2/CONFIGURE
index 7f6fa83..8f93251 100755
--- a/video/mplayer2/CONFIGURE
+++ b/video/mplayer2/CONFIGURE
@@ -1,6 +1,8 @@
-config_query_option MPLAYER_IVTV \
- "Build against IVTV?" n \
- "--enable-ivtv" "--disable-ivtv" &&
+if [ "$MPLAYER2_BRANCH" != "scm" ]; then
+ config_query_option MPLAYER_IVTV \
+ "Build against IVTV?" n \
+ "--enable-ivtv" "--disable-ivtv"
+fi &&
config_query_option MPLAYER_OPTS \
"Enable Joystick support?" y \
"--enable-joystick" "--disable-joystick"
diff --git a/video/mplayer2/DEPENDS b/video/mplayer2/DEPENDS
index c18802f..8b4c123 100755
--- a/video/mplayer2/DEPENDS
+++ b/video/mplayer2/DEPENDS
@@ -34,21 +34,25 @@ optional_depends twolame "" "" "Twolame (MPEG layer 2
audio) support in mencode
# audio devices
if [ "$MPLAYER2_BRANCH" != "scm" ]; then
optional_depends esound "" "--disable-esd" "for direct esd audio output"
&&
- optional_depends arts "" "--disable-arts" "for arts audio output"
+ optional_depends arts "" "--disable-arts" "for arts audio output" &&
+ optional_depends nas "" "--disable-nas" "for NAS audio output" &&
+ optional_depends svgalib "" "--disable-svga" "for svgalib video output"
&&
+ optional_depends xf86-video-mga "--enable-xmga" "--disable-xmga" "for
xmga output support" &&
+ optional_depends aalib "" "--disable-aa" "for aalib (ascii) video output"
&&
+ optional_depends libggi "" "--disable-ggi" "for GGI video output" &&
+ optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support" &&
+ optional_depends libnemesi "--enable-nemesi" "--disable-nemesi" "for
Streaming Control Transmission Protocol (sctp) support"
fi &&
optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" &&
-optional_depends nas "" "--disable-nas" "for NAS audio output" &&
optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio
output" &&

# video devices
-optional_depends svgalib "" "--disable-svga" "for svgalib video output" &&
optional_depends xorg-server "--enable-x11" "--disable-x11" "for X11 output
support" &&
if is_depends_enabled $SPELL xorg-server; then
depends -sub "DPMS" xorg-server
fi &&

optional_depends libxv "--enable-xv" "--disable-xv" "for xv output support"
&&
-optional_depends xf86-video-mga "--enable-xmga" "--disable-xmga" "for xmga
output support" &&

if [ "$MPLAYER2_BRANCH" == "scm" ]; then
depends git &&
@@ -59,8 +63,6 @@ fi &&
optional_depends sdl "" "--disable-sdl" "for SDL video and audio output" &&
optional_depends directfb "" "--disable-directfb" "for direct framebuffer
support" &&
optional_depends libcaca "" "--disable-caca" "for colored ASCII video
output" &&
-optional_depends aalib "" "--disable-aa" "for aalib (ascii) video output"
&&
-optional_depends libggi "" "--disable-ggi" "for GGI video output" &&

# image support
optional_depends giflib "" "--disable-gif" "to output to .gif files" &&
@@ -69,8 +71,7 @@ optional_depends JPEG "" "--disable-jpeg" "to output to
.jpeg files" &&

# misc
optional_depends cdparanoia "" "--disable-cdparanoia" "to play audio cds"
&&
-optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support" &&
-optional_depends libnemesi "--enable-nemesi" "--disable-nemesi" "for
Streaming Control Transmission Protocol (sctp) support" &&
+
optional_depends lirc "" "--disable-lirc" "for remote-control" &&
optional_depends freetype2 "" "--disable-freetype" "for truetype subtitle
font support" &&
optional_depends fontconfig "" "--disable-fontconfig" "for fontconfig font
lookup support" &&
diff --git a/video/mplayer2/HISTORY b/video/mplayer2/HISTORY
index a9b74b2..fd9a4d3 100644
--- a/video/mplayer2/HISTORY
+++ b/video/mplayer2/HISTORY
@@ -1,3 +1,7 @@
+2012-11-04 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD, CONFIGURE, DEPENDS: fixed the scm build
+ * INSTALL: install no man pages for scm branch
+
2012-07-20 Pol Vinogradov <vin.public AT gmail.com>
* BUILD: fixed python3 detection
* DEPENDS: corrected scm check, added git and python3 for scm branch
diff --git a/video/mplayer2/INSTALL b/video/mplayer2/INSTALL
new file mode 100755
index 0000000..f7b7584
--- /dev/null
+++ b/video/mplayer2/INSTALL
@@ -0,0 +1,5 @@
+if [ "$MPLAYER2_BRANCH" != "scm" ]; then
+ default_install
+else
+ make install-no-man
+fi



  • [SM-Commit] GIT changes to master grimoire by Pol Vinogradov (c5caff417f7c1bf7fce372d5849e7f903a8d2df1), Pol Vinogradov, 11/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page