From 52dd6809d0e4d849ebb84c022695cbb56b6db121 Mon Sep 17 00:00:00 2001
From: Kai Schwenzfeier <niteblade@gmx.net>
Date: Mon, 11 Jul 2005 16:56:10 +0000
Subject: [PATCH] Kai Schwenzfeier: 	update totally outdated smpeg to cvs 
 some cleanups

[2005061816245022424] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6181 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/kasc/smpeg/smpeg.conf         | 29 +++++++--------------------
 package/kasc/smpeg/smpeg.desc         |  9 ++-------
 package/kasc/smpeg/subconfig-libs.hlp |  9 ---------
 package/kasc/smpeg/subconfig-libs.in  |  6 ------
 4 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/package/kasc/smpeg/smpeg.conf b/package/kasc/smpeg/smpeg.conf
index 300fde02e..e2bcc524e 100644
--- a/package/kasc/smpeg/smpeg.conf
+++ b/package/kasc/smpeg/smpeg.conf
@@ -25,49 +25,34 @@ autogen=1
 
 smpeg_preconf()
 {
-  ACLOCAL_FLAGS="-I $root/$ROCKCFG_PKG_GNOME14_CORE_PREFIX/share/aclocal"
-  export ACLOCAL_FLAGS
+#  ACLOCAL_FLAGS="-I $root/$ROCKCFG_PKG_GNOME14_CORE_PREFIX/share/aclocal"
+#  export ACLOCAL_FLAGS
 
-  if [ $ROCKCFG_PKG_SMPEG_MMX == 1 ] ; then
+  if [ "$ROCKCFG_PKG_SMPEG_MMX" == "1" ] ; then
     var_append extraconfopt " " "--enable-mmx"
   else
     var_append extraconfopt " " "--disable-mmx"
   fi
-  if [ $ROCKCFG_PKG_SMPEG_ATI == 1 ] ; then
+  if [ "$ROCKCFG_PKG_SMPEG_ATI" == "1" ] ; then
     var_append extraconfopt " " "--enable-ati"
   else
     var_append extraconfopt " " "--disable-ati"
   fi
-  if [ $ROCKCFG_PKG_SMPEG_SYNC == 1 ] ; then
-    var_append extraconfopt " " "--enable-timestamp-sync"
-  else
-    var_append extraconfopt " " "--disable-timestamp-sync"
-  fi
-  if [ $ROCKCFG_PKG_SMPEG_THSYS == 1 ] ; then
+  if [ "$ROCKCFG_PKG_SMPEG_THSYS" == "1" ] ; then
     var_append extraconfopt " " "--enable-threaded-system"
   else
     var_append extraconfopt " " "--disable-threaded-system"
   fi
-  if [ $ROCKCFG_PKG_SMPEG_THAUDIO == 1 ] ; then
-    var_append extraconfopt " " "--enable-threaded-audio"
-  else
-    var_append extraconfopt " " "--disable-threaded-audio"
-  fi
-  if [ $ROCKCFG_PKG_SMPEG_GTKPLAY == 1 ] ; then
+  if [ "$ROCKCFG_PKG_SMPEG_GTKPLAY" == "1" ] ; then
     var_append extraconfopt " " "--enable-gtk-player"
   else
     var_append extraconfopt " " "--disable-gtk-player"
   fi
-  if [ $ROCKCFG_PKG_SMPEG_GLPLAY == 1 ] ; then
+  if [ "$ROCKCFG_PKG_SMPEG_GLPLAY" == "1" ] ; then
     var_append extraconfopt " " "--enable-opengl-player"
   else
     var_append extraconfopt " " "--disable-opengl-player"
   fi
-  if [ $ROCKCFG_PKG_SMPEG_ASSERT == 1 ] ; then
-    var_append extraconfopt " " "--enable-assertions"
-  else
-    var_append extraconfopt " " "--disable-assertions"
-  fi
 }
 
 hook_add preconf 3 smpeg_preconf
diff --git a/package/kasc/smpeg/smpeg.desc b/package/kasc/smpeg/smpeg.desc
index 877919f0b..54a92c21e 100644
--- a/package/kasc/smpeg/smpeg.desc
+++ b/package/kasc/smpeg/smpeg.desc
@@ -36,13 +36,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 2003-05-09
+[V] 2005-06-18
 [P] X -?---5---9 177.200
 
-[D] 631527600 smpeg-2003-05-09.tar.bz2 http://drocklinux.dyndns.org/ftp/software/smpeg/
-
-#cvs -d:pserver:anonymous@cvs.icculus.org:/cvs/cvsroot login
-#(the password is "anonymous")
-#cvs -z3 -d:pserver:anonymous@cvs.icculus.org:/cvs/cvsroot co smpeg
-
+[D] X smpeg-2005-06-18.tar.bz2 cvs://pserver:anonymous:anonymous@cvs.icculus.org:/cvs/cvsroot::smpeg/!20050618/
 
diff --git a/package/kasc/smpeg/subconfig-libs.hlp b/package/kasc/smpeg/subconfig-libs.hlp
index 41865f0b6..5327aefb9 100644
--- a/package/kasc/smpeg/subconfig-libs.hlp
+++ b/package/kasc/smpeg/subconfig-libs.hlp
@@ -1,24 +1,15 @@
 MENU_PKG_SMPEG
   Here you'll find options for SDL MPEG Library
 
-ROCKCFG_PKG_SMPEG_ASSERT
-  Enable consistency checks in decoding
-
 ROCKCFG_PKG_SMPEG_GLPLAY
   build an OpenGL sample SMPEG player
 
 ROCKCFG_PKG_SMPEG_GTKPLAY
   build a GTk sample SMPEG player
 
-ROCKCFG_PKG_SMPEG_THAUDIO
-  enable threaded audio
-
 ROCKCFG_PKG_SMPEG_THSYS
   enable system thread
 
-ROCKCFG_PKG_SMPEG_SYNC
-  enable system timestamp sync
-
 ROCKCFG_PKG_SMPEG_ATI
   enable ATI Rage128 hardware acceleration
 
diff --git a/package/kasc/smpeg/subconfig-libs.in b/package/kasc/smpeg/subconfig-libs.in
index 6c889ee1b..b3424eb36 100644
--- a/package/kasc/smpeg/subconfig-libs.in
+++ b/package/kasc/smpeg/subconfig-libs.in
@@ -27,18 +27,12 @@ if pkgcheck smpeg X ; then
 	  enable MMX IDCT decoding routines"
 	bool 'enable ati' ROCKCFG_PKG_SMPEG_ATI 0 "
 	  enable ATI Rage128 hardware acceleration"
-	bool 'enable timestamp synx' ROCKCFG_PKG_SMPEG_SYNC 1 "
-	  enable system timestamp sync"
 	bool 'enable system thread' ROCKCFG_PKG_SMPEG_THSYS 0 "
 	  enable system thread"
-	bool 'enable threaded audio' ROCKCFG_PKG_SMPEG_THAUDIO 1 "
-	  enable threaded audio"
 	bool 'enable GTK player' ROCKCFG_PKG_SMPEG_GTKPLAY 1 "
 	  build a GTk sample SMPEG player"
 	bool 'enable OpenGL player' ROCKCFG_PKG_SMPEG_GLPLAY 1 "
 	  build an OpenGL sample SMPEG player"
-	bool 'enable assertions' ROCKCFG_PKG_SMPEG_ASSERT 0 "
-	  Enable consistency checks in decoding"
       block_end
     menu_end
 fi