Use more of the libraries present on Slackware to reduce package size

1 files changed, 36 insertions, 41 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index c2e39f23..42f862dd 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -113,56 +113,35 @@ SRCURL[3]="$CONTRIBURL/faad2-$FAAD2.tar.gz"
 SOURCE[4]="$SRCDIR/ffmpeg-$FFMPEG.tar.bz2"
 SRCURL[4]="$CONTRIBURL/ffmpeg-$FFMPEG.tar.bz2"
 
-SOURCE[5]="$SRCDIR/fontconfig-$FONTCONFIG.tar.gz"
-SRCURL[5]="$CONTRIBURL/fontconfig-$FONTCONFIG.tar.gz"
+SOURCE[5]="$SRCDIR/lame-$LAME.tar.gz"
+SRCURL[5]="$CONTRIBURL/lame-$LAME.tar.gz"
 
-SOURCE[6]="$SRCDIR/freetype-$FREETYPE.tar.gz"
-SRCURL[6]="$CONTRIBURL/freetype-$FREETYPE.tar.gz"
+SOURCE[6]="$SRCDIR/libass-$ASS.tar.bz2"
+SRCURL[6]="$CONTRIBURL/libass-$ASS.tar.bz2"
 
-SOURCE[7]="$SRCDIR/lame-$LAME.tar.gz"
-SRCURL[7]="$CONTRIBURL/lame-$LAME.tar.gz"
+SOURCE[7]="$SRCDIR/libbluray-$BLURAY.tar.gz"
+SRCURL[7]="$CONTRIBURL/libbluray-$BLURAY.tar.gz"
 
-SOURCE[8]="$SRCDIR/libass-$ASS.tar.bz2"
-SRCURL[8]="$CONTRIBURL/libass-$ASS.tar.bz2"
+SOURCE[8]="$SRCDIR/libdca-$DCA.tar.gz"
+SRCURL[8]="$CONTRIBURL/libdca-$DCA.tar.gz"
 
-SOURCE[9]="$SRCDIR/libbluray-$BLURAY.tar.gz"
-SRCURL[9]="$CONTRIBURL/libbluray-$BLURAY.tar.gz"
+SOURCE[9]="$SRCDIR/libdvdnav-$DVDNAV.tar.gz"
+SRCURL[9]="$CONTRIBURL/libdvdnav-$DVDNAV.tar.gz"
 
-SOURCE[10]="$SRCDIR/libdca-$DCA.tar.gz"
-SRCURL[10]="$CONTRIBURL/libdca-$DCA.tar.gz"
+SOURCE[10]="$SRCDIR/libdvdread-$DVDREAD.tar.gz"
+SRCURL[10]="$CONTRIBURL/libdvdread-$DVDREAD.tar.gz"
 
-SOURCE[11]="$SRCDIR/libdvdnav-$DVDNAV.tar.gz"
-SRCURL[11]="$CONTRIBURL/libdvdnav-$DVDNAV.tar.gz"
+SOURCE[11]="$SRCDIR/libmkv-$MKV.tar.bz2"
+SRCURL[11]="$CONTRIBURL/libmkv-$MKV.tar.bz2"
 
-SOURCE[12]="$SRCDIR/libdvdread-$DVDREAD.tar.gz"
-SRCURL[12]="$CONTRIBURL/libdvdread-$DVDREAD.tar.gz"
+SOURCE[12]="$SRCDIR/mp4v2-$MP4V2.tar.bz2"
+SRCURL[12]="$CONTRIBURL/mp4v2-$MP4V2.tar.bz2"
 
-SOURCE[13]="$SRCDIR/libmkv-$MKV.tar.bz2"
-SRCURL[13]="$CONTRIBURL/libmkv-$MKV.tar.bz2"
+SOURCE[13]="$SRCDIR/mpeg2dec-$MPEG2DEC.tar.gz"
+SRCURL[13]="$CONTRIBURL/mpeg2dec-$MPEG2DEC.tar.gz"
 
-SOURCE[14]="$SRCDIR/libogg-$OGG.tar.gz"
-SRCURL[14]="$CONTRIBURL/libogg-$OGG.tar.gz"
-
-SOURCE[15]="$SRCDIR/libsamplerate-$SAMPLERATE.tar.gz"
-SRCURL[15]="$CONTRIBURL/libsamplerate-$SAMPLERATE.tar.gz"
-
-SOURCE[16]="$SRCDIR/libtheora-$THEORA.tar.bz2"
-SRCURL[16]="$CONTRIBURL/libtheora-$THEORA.tar.bz2"
-
-SOURCE[17]="$SRCDIR/libvorbis-$VORBIS.tar.gz"
-SRCURL[17]="$CONTRIBURL/libvorbis-$VORBIS.tar.gz"
-
-SOURCE[18]="$SRCDIR/libxml2-$XML2.tar.gz"
-SRCURL[18]="$CONTRIBURL/libxml2-$XML2.tar.gz"
-
-SOURCE[19]="$SRCDIR/mp4v2-$MP4V2.tar.bz2"
-SRCURL[19]="$CONTRIBURL/mp4v2-$MP4V2.tar.bz2"
-
-SOURCE[20]="$SRCDIR/mpeg2dec-$MPEG2DEC.tar.gz"
-SRCURL[20]="$CONTRIBURL/mpeg2dec-$MPEG2DEC.tar.gz"
-
-SOURCE[21]="$SRCDIR/x264-$X264.tar.gz"
-SRCURL[21]="$CONTRIBURL/x264-$X264.tar.gz"
+SOURCE[14]="$SRCDIR/x264-$X264.tar.gz"
+SRCURL[14]="$CONTRIBURL/x264-$X264.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -299,6 +278,22 @@ if ! which yasm 1>/dev/null 2>&1 ; then
 fi
 
 echo Building ...
+# Try to shrink the package by using system libraries instead of static libs:
+for module in fontconfig freetype libogg libsamplerate libtheora libvorbis libxml2 ; do
+  sed -i -e "s/^MODULES.*\/$module//" make/include/main.defs
+  sed -i -e "s/^MODULES.*\/$module//" libhb/module.defs
+done
+
+# For the above, change static library linking with dynamic linking:
+for module in fontconfig freetype ogg samplerate theora theoraenc theoradec vorbis vorbisenc xml2; do
+  sed -i -e "s/$module//" test/module.defs
+  sed -i -e "s/^\( *..CONTRIB.build.*\)/\1 -l$module/" test/module.defs
+  sed -i -e "s/^\( *..CONTRIB.build.*\)/\1 -l$module/" libhb/module.defs
+done
+
+# Make sure that we link against both -ltheora, -ltheoraenc, and -ltheoradec
+sed -i 's/-ltheora/-ltheora -ltheoraenc -ltheoradec/' gtk/src/Makefile.am
+
 # This will build the commandline and GTK programs
 #  - note: this compilation will download many dependency lbraries
 #    and compile then statically into the application.