[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (9ed96241e8f6cdb8539aa32cfa409d32321c0962)

Eric Sandall scm at sourcemage.org
Tue Oct 19 11:51:54 EDT 2010


GIT changes to master z-rejected grimoire by Eric Sandall <sandalle at sourcemage.org>:

 z-net/ts3_client/BUILD                  |    6 +++++-
 z-net/ts3_client/DETAILS                |    4 ++++
 z-net/ts3_client/HISTORY                |    7 +++++++
 z-net/ts3_client/INSTALL                |    6 ++++++
 z-net/ts3_client/PRE_BUILD              |    2 ++
 z-net/ts3_client/jpegsrc.v6b.tar.gz.sig |binary
 6 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 9ed96241e8f6cdb8539aa32cfa409d32321c0962
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    ts3_client: Build and install own copy of libjpeg.so.62 (jpeg 6b)
    
    Doing initialization for the ldd check
    Checking ts3_client (1 of 1)
            File test
            Library test
    The following files from ts3_client have missing library dependencies:
    /usr/libexec/ts3_client/imageformats/libqjpeg.so
            libjpeg.so.62 => not found

diff --git a/z-net/ts3_client/BUILD b/z-net/ts3_client/BUILD
index 27ba77d..7748da8 100755
--- a/z-net/ts3_client/BUILD
+++ b/z-net/ts3_client/BUILD
@@ -1 +1,5 @@
-true
+cd $SOURCE_DIRECTORY/jpeg-6b &&
+OPTS="--enable-shared $OPTS" &&
+./ltconfig --no-verify ./ltmain.sh $HOST &&
+default_build &&
+cd $SOURCE_DIRECTORY
diff --git a/z-net/ts3_client/DETAILS b/z-net/ts3_client/DETAILS
index 725fd0b..6a02b31 100755
--- a/z-net/ts3_client/DETAILS
+++ b/z-net/ts3_client/DETAILS
@@ -12,9 +12,13 @@ else
   SOURCE_DIRECTORY=$BUILD_DIRECTORY/TeamSpeak3-Client-linux_x86
 fi
    SOURCE_URL[0]=http://ftp.4players.de/pub/hosted/ts3/releases/beta-32/$SOURCE
+         SOURCE2=jpegsrc.v6b.tar.gz
+     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
+  SOURCE2_URL[0]=http://www.ijg.org/files/$SOURCE2
         WEB_SITE=http://www.goteamspeak.com/
          ENTERED=20100501
       LICENCE[0]=http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest
+      PATCHLEVEL=1
           REJECT="has licensing issues"
            SHORT="P2P talking over the net (client side)"
 cat << EOF
diff --git a/z-net/ts3_client/HISTORY b/z-net/ts3_client/HISTORY
index 7e1a33b..724cb81 100644
--- a/z-net/ts3_client/HISTORY
+++ b/z-net/ts3_client/HISTORY
@@ -1,3 +1,10 @@
+2010-10-19 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Add jpeg 6b as SOURCE2
+	  PATCHLEVEL++
+	* PRE_BUILD: Unpack SOURCE2
+	* BUILD: Build jpeg 6b
+	* INSTALL: Copy libjpeg.so.62 to client lib directory
+
 2010-10-18 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated x86/x86_64 to 3.0.0beta32
 	* PRE_BUILD: Updated filesize
diff --git a/z-net/ts3_client/INSTALL b/z-net/ts3_client/INSTALL
index 4290bdc..f1f5a66 100755
--- a/z-net/ts3_client/INSTALL
+++ b/z-net/ts3_client/INSTALL
@@ -1,5 +1,11 @@
 local INSTALLDIR=/usr/libexec/$SPELL &&
 
+# Copy custom-build libjpeg.so, stupid binaries
+mkdir -p $INSTALL_ROOT/usr/libexec/ts3_client/imageformats &&
+cp -v $SOURCE_DIRECTORY/jpeg-6b/.libs/libjpeg.so \
+  $INSTALL_ROOT/usr/libexec/ts3_client/imageformats/libjpeg.so.62 &&
+rm -rf $SOURCE_DIRECTORY/jpeg-6b &&
+
 # create dirs and install.
 mkdir -p $INSTALLDIR &&
 cp -rv ./*    $INSTALLDIR/ &&
diff --git a/z-net/ts3_client/PRE_BUILD b/z-net/ts3_client/PRE_BUILD
index cd188f4..4951a0a 100755
--- a/z-net/ts3_client/PRE_BUILD
+++ b/z-net/ts3_client/PRE_BUILD
@@ -1,6 +1,8 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
 verify_source '' &&
+verify_file '2' &&
+unpack_file '2' &&
 
 #
 # Untar the files and bypass the annoying license query in
diff --git a/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig b/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig
new file mode 100644
index 0000000..eef6a8e
Binary files /dev/null and b/z-net/ts3_client/jpegsrc.v6b.tar.gz.sig differ



More information about the SM-Commit mailing list