aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/smc/README16
-rw-r--r--games/smc/slack-desc2
-rw-r--r--games/smc/smc-1.9_boost.patch63
-rw-r--r--games/smc/smc.SlackBuild12
-rw-r--r--games/smc/smc.info10
-rw-r--r--games/smc/smc1.8_boost1.36.patch63
6 files changed, 79 insertions, 87 deletions
diff --git a/games/smc/README b/games/smc/README
index 81836edcaf6a4..9e4c750014075 100644
--- a/games/smc/README
+++ b/games/smc/README
@@ -8,16 +8,12 @@ developed in C++.
** REQUIRES **
To compile this game you will need OpenGL (with hardware acceleration
-enabled), CEGUI, and Boost. Make sure CEGUI is compiled *WITHOUT* DevIL
-support (or just make sure it is not the default image codec) and *WITH*
-either FreeImage or SILLY codec support (FreeImage is the most
-recommended choice). Also, the background music for this game, if desired,
-must be installed as a separate package. SlackBuilds for the music pack,
-Boost, FreeImage, and CEGUI can all be found on SlackBuilds.org.
-
-*NOTE* If you are using a Boost version prior to 1.36 you should try using
-this SlackBuild without the boost patch by executing:
- PATCHBOOST=NO ./smc.SlackBuild
+enabled) and CEGUI. Make sure CEGUI is compiled *WITHOUT* DevIL support
+(or just make sure it is not the default image codec) and *WITH* either
+FreeImage or SILLY codec support (FreeImage is the most recommended choice).
+Also, the background music for this game, if desired, must be installed as
+a separate package. SlackBuilds for the music pack, FreeImage, and CEGUI
+can all be found on SlackBuilds.org.
Please see readme-linux.txt in the docs directory of the source for more
information on this software.
diff --git a/games/smc/slack-desc b/games/smc/slack-desc
index 757ffef88ec7d..a5761cf280974 100644
--- a/games/smc/slack-desc
+++ b/games/smc/slack-desc
@@ -14,6 +14,6 @@ smc: as Super Mario Bros. It uses the platform independent library SDL
smc: and, since version 0.98, the OpenGL accelerated Graphics Renderer.
smc: The game is developed in C++.
smc:
-smc: http://www.secretmaryo.org/
+smc: Homepage: http://www.secretmaryo.org/
smc:
smc:
diff --git a/games/smc/smc-1.9_boost.patch b/games/smc/smc-1.9_boost.patch
new file mode 100644
index 0000000000000..5cbc40a48ad22
--- /dev/null
+++ b/games/smc/smc-1.9_boost.patch
@@ -0,0 +1,63 @@
+diff -Naur smc-1.9-orig/src/core/filesystem/filesystem.cpp smc-1.9/src/core/filesystem/filesystem.cpp
+--- smc-1.9-orig/src/core/filesystem/filesystem.cpp 2009-07-04 05:11:18.000000000 -0500
++++ smc-1.9/src/core/filesystem/filesystem.cpp 2009-09-07 00:28:01.000000000 -0500
+@@ -142,32 +142,32 @@
+ if( fs::is_directory( *dir_itr ) )
+ {
+ // ignore hidden directories
+- if( dir_itr->path().leaf().find( "." ) == 0 )
++ if( dir_itr->path().filename().find( "." ) == 0 )
+ {
+ continue;
+ }
+
+ if( with_directories )
+ {
+- valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
++ valid_files.push_back( dir + "/" + dir_itr->path().filename() );
+ }
+
+ // load all items from the sub-directory
+ if( search_in_sub_directories )
+ {
+- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
++ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename(), file_type, with_directories );
+ valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
+ }
+ }
+ // valid file
+- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
++ else if( file_type.empty() || dir_itr->path().filename().rfind( file_type ) != std::string::npos )
+ {
+- valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
++ valid_files.push_back( dir + "/" + dir_itr->path().filename() );
+ }
+ }
+ catch( const std::exception &ex )
+ {
+- printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() );
++ printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() );
+ }
+ }
+
+diff -Naur smc-1.9-orig/src/overworld/world_manager.cpp smc-1.9/src/overworld/world_manager.cpp
+--- smc-1.9-orig/src/overworld/world_manager.cpp 2009-08-16 11:44:52.000000000 -0500
++++ smc-1.9/src/overworld/world_manager.cpp 2009-09-07 00:28:45.000000000 -0500
+@@ -118,7 +118,7 @@
+ {
+ try
+ {
+- std::string current_dir = dir_itr->path().leaf();
++ std::string current_dir = dir_itr->path().filename();
+
+ // only directories with an existing description
+ if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
+@@ -145,7 +145,7 @@
+ }
+ catch( const std::exception &ex )
+ {
+- printf( "%s %s\n", dir_itr->path().leaf().c_str(), ex.what() );
++ printf( "%s %s\n", dir_itr->path().filename().c_str(), ex.what() );
+ }
+ }
+ }
diff --git a/games/smc/smc.SlackBuild b/games/smc/smc.SlackBuild
index 9357979bd4346..06583f78fb2a7 100644
--- a/games/smc/smc.SlackBuild
+++ b/games/smc/smc.SlackBuild
@@ -4,7 +4,7 @@
# Written by Phillip Warner <pc_warner@yahoo.com>
PRGNAM=smc
-VERSION=${VERSION:-1.8}
+VERSION=${VERSION:-1.9}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -14,9 +14,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-# Say NO here if using boost < 1.36
-PATCHBOOST=${PATCHBOOST:-YES}
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -39,10 +36,7 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+rw,go-w .
-if [ "$PATCHBOOST" == "YES" ]; then
- patch -p1 < $CWD/smc1.8_boost1.36.patch
-fi
-
+patch -p1 < $CWD/smc-1.9_boost.patch
./autogen.sh
CFLAGS="$SLKCFLAGS" \
@@ -70,4 +64,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/smc/smc.info b/games/smc/smc.info
index b0ffbe9f87c46..3a8c2527c2d4b 100644
--- a/games/smc/smc.info
+++ b/games/smc/smc.info
@@ -1,8 +1,10 @@
PRGNAM="smc"
-VERSION="1.8"
+VERSION="1.9"
HOMEPAGE="http://www.secretmaryo.org/"
-DOWNLOAD="http://downloads.sourceforge.net/smclone/smc-1.8.tar.bz2"
-MD5SUM="448efe236ae6031dcf08761496d469ad"
+DOWNLOAD="http://downloads.sourceforge.net/smclone/smc-1.9.tar.bz2"
+DOWNLOAD_x86_64=""
+MD5SUM="75ab7826303c49aec25b052a8b90287f"
+MD5SUM_x86_64=""
MAINTAINER="Phillip Warner"
EMAIL="pc_warner@yahoo.com"
-APPROVED="Erik Hanson,rworkman"
+APPROVED="dsomero"
diff --git a/games/smc/smc1.8_boost1.36.patch b/games/smc/smc1.8_boost1.36.patch
deleted file mode 100644
index 3f8c8173a5924..0000000000000
--- a/games/smc/smc1.8_boost1.36.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naru smc-1.8-orig/src/core/game_core.cpp smc-1.8/src/core/game_core.cpp
---- smc-1.8-orig/src/core/game_core.cpp 2009-04-08 00:48:08.000000000 -0500
-+++ smc-1.8/src/core/game_core.cpp 2009-06-05 23:26:43.000000000 -0500
-@@ -1632,32 +1632,32 @@
- if( fs::is_directory( *dir_itr ) )
- {
- // ignore hidden directories
-- if( dir_itr->leaf().find( "." ) == 0 )
-+ if( dir_itr->filename().find( "." ) == 0 )
- {
- continue;
- }
-
- if( with_directories )
- {
-- valid_files.push_back( dir + "/" + dir_itr->leaf() );
-+ valid_files.push_back( dir + "/" + dir_itr->filename() );
- }
-
- // load all items from the sub-directory
- if( search_in_sub_directories )
- {
-- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->leaf(), file_type, with_directories );
-+ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->filename(), file_type, with_directories );
- valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- }
- }
- // valid file
-- else if( file_type.empty() || dir_itr->leaf().rfind( file_type ) != std::string::npos )
-+ else if( file_type.empty() || dir_itr->filename().rfind( file_type ) != std::string::npos )
- {
-- valid_files.push_back( dir + "/" + dir_itr->leaf() );
-+ valid_files.push_back( dir + "/" + dir_itr->filename() );
- }
- }
- catch( const std::exception &ex )
- {
-- printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() );
-+ printf( "%s %s\n", dir_itr->filename().c_str(), ex.what() );
- }
- }
-
-diff -Naru smc-1.8-orig/src/overworld/world_manager.cpp smc-1.8/src/overworld/world_manager.cpp
---- smc-1.8-orig/src/overworld/world_manager.cpp 2009-02-17 22:10:12.000000000 -0600
-+++ smc-1.8/src/overworld/world_manager.cpp 2009-06-05 23:27:21.000000000 -0500
-@@ -116,7 +116,7 @@
- {
- try
- {
-- std::string current_dir = dir_itr->leaf();
-+ std::string current_dir = dir_itr->filename();
-
- // only directories with an existing description
- if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
-@@ -143,7 +143,7 @@
- }
- catch( const std::exception &ex )
- {
-- printf( "%s %s\n", dir_itr->leaf().c_str(), ex.what() );
-+ printf( "%s %s\n", dir_itr->filename().c_str(), ex.what() );
- }
- }
- }
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-23 22:37:26 +0000