[Lunar-commits] <moonbase-other> Merge branch 'SOURCE1'
v4hn
me at v4hn.de
Mon Nov 4 21:20:31 CET 2013
commit e01147273f8ebef7e082f2e3b467eff6b4730009
Author: v4hn <me at v4hn.de>
Date: Mon, 04 Nov 2013 12:20:18 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/e01147273f8ebef7e082f2e3b467eff6b4730009
Merge branch 'SOURCE1'
Conflicts:
graphics/LibRaw/DETAILS
---
audio/amrnb/BUILD | +3/-7
audio/amrnb/DETAILS | +3/-3
audio/amrnb/PRE_BUILD | +1/-2
audio/amrwb/BUILD | +3/-7
audio/amrwb/DETAILS | +3/-3
audio/amrwb/PRE_BUILD | +1/-2
cd/udftools/BUILD | +0/-9
cd/udftools/DETAILS | +9/-9
cd/udftools/PRE_BUILD | +5/-0
fonts/truetype/BUILD | +8/-12
fonts/truetype/DETAILS | +12/-12
games/ufoai/BUILD | +0/-2
games/ufoai/DETAILS | +3/-3
games/ufoai/PRE_BUILD | +3/-2
graphics/LibRaw/BUILD | +2/-8
graphics/LibRaw/DETAILS | +5/-5
graphics/LibRaw/PRE_BUILD | +4/-3
libs/loudmouth/BUILD | +5/-16
libs/loudmouth/DETAILS | +3/-3
libs/loudmouth/PRE_BUILD | +7/-0
web/apache-log4cxx/BUILD | +6/-16
web/apache-log4cxx/DETAILS | +3/-3
web/apache-log4cxx/PRE_BUILD | +7/-0
23 files changed, 96 insertions(+), 127 deletions(-)
--- a/audio/amrnb/BUILD
+++ b/audio/amrnb/BUILD
@@ -1,9 +1,5 @@
-(
+default_config &&
- default_config &&
+sedit 's|$(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip|sleep 0|' Makefile
- sedit 's|$(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip|sleep 0|' Makefile
-
- default_make
-
-) > $C_FIFO 2>&1
+default_make
--- a/audio/amrnb/DETAILS
+++ b/audio/amrnb/DETAILS
@@ -1,11 +1,11 @@
MODULE=amrnb
VERSION=10.0.0.0
SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE1=26104-700.zip
+ SOURCE2=26104-700.zip
SOURCE_URL=http://ftp.penguin.cz/pub/users/utx/amr/
- SOURCE1_URL=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/
+ SOURCE2_URL=http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/
SOURCE_VFY=sha1:8db731f9848f4d8af87828951358cdb4cc2355d3
- SOURCE1_VFY=sha1:2631a2e7ec06294b36eb7bf8f80ada1799fb6bf8
+ SOURCE2_VFY=sha1:2631a2e7ec06294b36eb7bf8f80ada1799fb6bf8
WEB_SITE=http://www.penguin.cz/~utx/amr
ENTERED=20071025
UPDATED=20130116
--- a/audio/amrnb/PRE_BUILD
+++ b/audio/amrnb/PRE_BUILD
@@ -1,3 +1,2 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-cp $SOURCE_CACHE/$SOURCE1 $SOURCE_DIRECTORY
+cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY
--- a/audio/amrwb/BUILD
+++ b/audio/amrwb/BUILD
@@ -1,9 +1,5 @@
-(
+default_config &&
- default_config &&
+sedit 's|$(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip|sleep 0|' Makefile
- sedit 's|$(DOWNLOADER_PROG) http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-700.zip|sleep 0|' Makefile
-
- default_make
-
-) > $C_FIFO 2>&1
+default_make
--- a/audio/amrwb/DETAILS
+++ b/audio/amrwb/DETAILS
@@ -1,11 +1,11 @@
MODULE=amrwb
VERSION=10.0.0.0
SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE1=26204-700.zip
+ SOURCE2=26204-700.zip
SOURCE_URL=http://ftp.penguin.cz/pub/users/utx/amr/
- SOURCE1_URL=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204
+ SOURCE2_URL=http://www.3gpp.org/ftp/Specs/archive/26_series/26.204
SOURCE_VFY=sha1:2c3373e14d953bd20c0279297ac3dcbdc4774415
- SOURCE1_VFY=sha1:16634b168b407c3a72963117b0fab997725b92f6
+ SOURCE2_VFY=sha1:16634b168b407c3a72963117b0fab997725b92f6
WEB_SITE=http://www.penguin.cz/~utx/amr
ENTERED=20071025
UPDATED=20130116
--- a/audio/amrwb/PRE_BUILD
+++ b/audio/amrwb/PRE_BUILD
@@ -1,3 +1,2 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-cp $SOURCE_CACHE/$SOURCE1 $SOURCE_DIRECTORY
+cp $SOURCE_CACHE/$SOURCE2 $SOURCE_DIRECTORY
--- a/cd/udftools/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
- patch_it $SOURCE_CACHE/$SOURCE1 1 &&
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
- patch_it $SOURCE_CACHE/$SOURCE3 1 &&
- patch_it $SOURCE_CACHE/$SOURCE4 0 &&
- default_build
-
-) > $C_FIFO 2>&1
--- a/cd/udftools/DETAILS
+++ b/cd/udftools/DETAILS
@@ -1,20 +1,20 @@
MODULE=udftools
VERSION=1.0.0b3
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE1=$MODULE-$VERSION-gcc4-1.patch.bz2
- SOURCE2=$MODULE-$VERSION-misc_fixes-1.patch.bz2
- SOURCE3=$MODULE-$VERSION-uid_gid-1.patch.bz2
- SOURCE4=$MODULE.missing.limits.patch
+ SOURCE2=$MODULE-$VERSION-gcc4-1.patch.bz2
+ SOURCE3=$MODULE-$VERSION-misc_fixes-1.patch.bz2
+ SOURCE4=$MODULE-$VERSION-uid_gid-1.patch.bz2
+ SOURCE5=$MODULE.missing.limits.patch
SOURCE_URL=$SFORGE_URL/linux-udf/
- SOURCE1_URL=$PATCH_URL
SOURCE2_URL=$PATCH_URL
SOURCE3_URL=$PATCH_URL
SOURCE4_URL=$PATCH_URL
+ SOURCE5_URL=$PATCH_URL
SOURCE_VFY=sha1:f1ceaff8dad3ddd5fe55c0b8db804fe7ca3b4308
- SOURCE1_VFY=sha1:0205dee122dd812683e5446b6243a0a658b56a46
- SOURCE2_VFY=sha1:82e848d012ccaaa743be529ace8250edd6766aee
- SOURCE3_VFY=sha1:7abc651f9a9e9a53618d26595772f32e6f1bfe3a
- SOURCE4_VFY=sha1:9658480a533572476985a8b65a86280bfcd1cca2
+ SOURCE2_VFY=sha1:0205dee122dd812683e5446b6243a0a658b56a46
+ SOURCE3_VFY=sha1:82e848d012ccaaa743be529ace8250edd6766aee
+ SOURCE4_VFY=sha1:7abc651f9a9e9a53618d26595772f32e6f1bfe3a
+ SOURCE5_VFY=sha1:9658480a533572476985a8b65a86280bfcd1cca2
WEB_SITE=http://sourceforge.net/projects/linux-udf/
ENTERED=20060527
UPDATED=20090419
--- /dev/null
+++ b/cd/udftools/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 1 &&
+patch_it $SOURCE4 1 &&
+patch_it $SOURCE5 0
--- a/fonts/truetype/BUILD
+++ b/fonts/truetype/BUILD
@@ -1,15 +1,11 @@
-(
+TTFD=/usr/share/fonts/truetype
- TTFD=/usr/share/fonts/truetype
-
- prepare_install &&
+prepare_install &&
- if [ ! -d $TTFD ] ; then
- mkdir -p $TTFD
- fi &&
+if [ ! -d $TTFD ] ; then
+ mkdir -p $TTFD
+fi &&
- cp -f $SOURCE_DIRECTORY/*.ttf $TTFD &&
- cd $TTFD &&
- mkfontdir
-
-) > $C_FIFO 2>&1
+cp -f $SOURCE_DIRECTORY/*.ttf $TTFD &&
+cd $TTFD &&
+mkfontdir
--- a/fonts/truetype/DETAILS
+++ b/fonts/truetype/DETAILS
@@ -1,20 +1,19 @@
MODULE=truetype
VERSION=1.1
SOURCE=IELPKTH.CAB
- SOURCE1=webdin32.exe
- SOURCE2=trebuc32.exe
- SOURCE3=georgi32.exe
- SOURCE4=verdan32.exe
- SOURCE5=comic32.exe
- SOURCE6=arialb32.exe
- SOURCE7=impact32.exe
- SOURCE8=arial32.exe
- SOURCE9=times32.exe
- SOURCE10=courie32.exe
- SOURCE11=andale32.exe
+ SOURCE2=webdin32.exe
+ SOURCE3=trebuc32.exe
+ SOURCE4=georgi32.exe
+ SOURCE5=verdan32.exe
+ SOURCE6=comic32.exe
+ SOURCE7=arialb32.exe
+ SOURCE8=impact32.exe
+ SOURCE9=arial32.exe
+ SOURCE10=times32.exe
+ SOURCE11=courie32.exe
+ SOURCE12=andale32.exe
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
SOURCE_URL[0]=$SFORGE_URL/corefonts/
- SOURCE1_URL[0]=$SFORGE_URL/corefonts/
SOURCE2_URL[0]=$SFORGE_URL/corefonts/
SOURCE3_URL[0]=$SFORGE_URL/corefonts/
SOURCE4_URL[0]=$SFORGE_URL/corefonts/
@@ -25,6 +24,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
SOURCE9_URL[0]=$SFORGE_URL/corefonts/
SOURCE10_URL[0]=$SFORGE_URL/corefonts/
SOURCE11_URL[0]=$SFORGE_URL/corefonts/
+ SOURCE12_URL[0]=$SFORGE_URL/corefonts/
WEB_SITE=http://corefonts.sourceforge.net/
ENTERED=20020124
UPDATED=20030628
--- a/games/ufoai/BUILD
+++ b/games/ufoai/BUILD
@@ -1,5 +1,3 @@
-sedit "/^}$/d; /enum CameraDrawMode/ i }\n" src/tools/radiant/radiant/camera/CameraSettings.h &&
-
# configure is a bit 'special'
./configure --prefix=/usr \
--bindir=/usr/games \
--- a/games/ufoai/DETAILS
+++ b/games/ufoai/DETAILS
@@ -1,12 +1,12 @@
MODULE=ufoai
VERSION=2.4
SOURCE=$MODULE-$VERSION-source.tar.bz2
- SOURCE1=$MODULE-$VERSION-data.tar
+ SOURCE2=$MODULE-$VERSION-data.tar
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
SOURCE_URL=$SFORGE_URL/$MODULE
- SOURCE1_URL=$SFORGE_URL/$MODULE
+ SOURCE2_URL=$SFORGE_URL/$MODULE
SOURCE_VFY=sha1:153ba796131f00fe98f96e56888376afee039aa5
- SOURCE1_VFY=sha1:2998c979ee597a1473c3277f8db14821e907999f
+ SOURCE2_VFY=sha1:2998c979ee597a1473c3277f8db14821e907999f
WEB_SITE=http://ufoai.sf.net
ENTERED=20080115
UPDATED=20121220
--- a/games/ufoai/PRE_BUILD
+++ b/games/ufoai/PRE_BUILD
@@ -1,3 +1,4 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE1
+unpack $SOURCE2 &&
+
+sedit "/^}$/d; /enum CameraDrawMode/ i }\n" src/tools/radiant/radiant/camera/CameraSettings.h
--- a/graphics/LibRaw/BUILD
+++ b/graphics/LibRaw/BUILD
@@ -1,9 +1,3 @@
-(
+OPTS+=" --disable-static --enable-demosaic-pack-gpl3=LibRaw-demosaic-pack-GPL3-$VERSION --disable-examples" &&
- sedit 's:CFLAGS=": CFLAGS="-fPIC :' configure &&
-
- OPTS+=" --disable-static --enable-demosaic-pack-gpl3=LibRaw-demosaic-pack-GPL3-$VERSION --disable-examples" &&
-
- default_build
-
-) > $C_FIFO 2>&1
+default_build
--- a/graphics/LibRaw/DETAILS
+++ b/graphics/LibRaw/DETAILS
@@ -1,14 +1,14 @@
MODULE=LibRaw
VERSION=0.15.4
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE1=$MODULE-demosaic-pack-GPL3-$VERSION.tar.gz
- SOURCE2=$MODULE-demosaic-pack-GPL2-$VERSION.tar.gz
+ SOURCE2=$MODULE-demosaic-pack-GPL3-$VERSION.tar.gz
+ SOURCE3=$MODULE-demosaic-pack-GPL2-$VERSION.tar.gz
SOURCE_URL=http://www.libraw.org/data/
- SOURCE1_URL=http://www.libraw.org/data/
SOURCE2_URL=http://www.libraw.org/data/
+ SOURCE3_URL=http://www.libraw.org/data/
SOURCE_VFY=sha1:771f0dfd0b42cb990880ef9bda59ce3f9d29c6d0
- SOURCE1_VFY=sha1:34be7dbdfd79cda9139cea0487561828fc050910
- SOURCE2_VFY=sha1:8e765e2a7c609f9ec0078a0c33d913ed554c279d
+ SOURCE2_VFY=sha1:34be7dbdfd79cda9139cea0487561828fc050910
+ SOURCE3_VFY=sha1:8e765e2a7c609f9ec0078a0c33d913ed554c279d
WEB_SITE=http://www.libraw.org
ENTERED=20100920
UPDATED=20130904
--- a/graphics/LibRaw/PRE_BUILD
+++ b/graphics/LibRaw/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-unpack $SOURCE1 &&
-unpack $SOURCE2
+unpack $SOURCE2 &&
+unpack $SOURCE3 &&
+
+sedit 's:CFLAGS=": CFLAGS="-fPIC :' configure
--- a/libs/loudmouth/BUILD
+++ b/libs/loudmouth/BUILD
@@ -1,18 +1,7 @@
-(
+#libtool > 1.5.22 support
+autoconf &&
-# Fix glib2 header problem.
- sedit "s:glib/gerror.h:glib.h:" loudmouth/lm-error.c &&
-
- #gnutls >= 2.6 support
- patch_it $SOURCE1 1 &&
-
- #libtool > 1.5.22 support
- autoconf &&
-
- #gtk-doc is broken for now
- OPTS+=" --disable-gtk-doc --with-asyncns=yes" &&
-
- default_build
-
-) > $C_FIFO 2>&1
+#gtk-doc is broken for now
+OPTS+=" --disable-gtk-doc --with-asyncns=yes" &&
+default_build
--- a/libs/loudmouth/DETAILS
+++ b/libs/loudmouth/DETAILS
@@ -1,11 +1,11 @@
MODULE=loudmouth
VERSION=1.4.3
SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE1=$MODULE-gnutls.patch.bz2
+ SOURCE2=$MODULE-gnutls.patch.bz2
SOURCE_URL=http://ftp.gnome.org/pub/GNOME/sources/loudmouth/${VERSION%.*}/
- SOURCE1_URL=$PATCH_URL/
+ SOURCE2_URL=$PATCH_URL/
SOURCE_VFY=sha1:55dd0475760f98ff0ba1f5c712c52ab776b432be
- SOURCE1_VFY=sha1:cbcd4886e03df3c122f6ad6587c617f6ae4692ae
+ SOURCE2_VFY=sha1:cbcd4886e03df3c122f6ad6587c617f6ae4692ae
WEB_SITE=http://www.loudmouth-project.org/about
ENTERED=20030719
UPDATED=20100219
--- /dev/null
+++ b/libs/loudmouth/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+# Fix glib2 header problem.
+sedit "s:glib/gerror.h:glib.h:" loudmouth/lm-error.c &&
+
+#gnutls >= 2.6 support
+patch_it $SOURCE2 1
--- a/web/apache-log4cxx/BUILD
+++ b/web/apache-log4cxx/BUILD
@@ -1,17 +1,7 @@
-(
+if in_depends $MODULE libiodbc; then
+ LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
+ else
+ LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
+fi &&
- patch_it $SOURCE_CCACHE/$SOURCE1 0 &&
-
- sed -i "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
- sed -i "22i #include <cstdio>" src/examples/cpp/console.cpp &&
- sed -i "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp &&
-
- if in_depends $MODULE libiodbc; then
- LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/libiodbc"
- else
- LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/"
- fi &&
-
- default_build
-
-) > $C_FIFO 2>&1
+default_build
--- a/web/apache-log4cxx/DETAILS
+++ b/web/apache-log4cxx/DETAILS
@@ -1,12 +1,12 @@
MODULE=apache-log4cxx
VERSION=0.10.0
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE1=log4cxx-$VERSION-unixODBC.patch
+ SOURCE2=log4cxx-$VERSION-unixODBC.patch
# SOURCE_URL=http://mirror.candidhosting.com/pub/apache/logging/log4cxx/$VERSION/
SOURCE_URL=http://apache.cs.utah.edu/logging/log4cxx/$VERSION/
- SOURCE1_URL=$PATCH_URL
+ SOURCE2_URL=$PATCH_URL
SOURCE_VFY=sha1:d79c053e8ac90f66c5e873b712bb359fd42b648d
- SOURCE1_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
+ SOURCE2_VFY=sha1:65769e23a384f01b8f2ebf915f0e055150d55cb6
WEB_SITE=http://logging.apache.org/log4cxx/index.html
ENTERED=20100321
UPDATED=20100321
--- /dev/null
+++ b/web/apache-log4cxx/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+
+patch_it $SOURCE2 0 &&
+
+sedit "22i #include <cstring>" src/main/cpp/socketoutputstream.cpp src/examples/cpp/console.cpp &&
+sedit "22i #include <cstdio>" src/examples/cpp/console.cpp &&
+sedit "22i #include <string.h>" src/main/cpp/inputstreamreader.cpp src/main/cpp/socketoutputstream.cpp
More information about the Lunar-commits
mailing list