diff options
| author | Treeve Jelbert | 2007-02-25 22:15:01 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2007-02-25 22:15:01 +0100 |
| commit | 0fae0c0e7579880844b52a02e604cca852a04a70 (patch) | |
| tree | 5a0f41240d786a09dfad190a3ef3dabfef418c7a | |
| parent | e43853e3cb8e00a1e486abf80fc3a3a202b85d10 (diff) | |
| parent | fa36f7407ea6411e43fa8863bdbe7da96e2077f1 (diff) | |
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
| -rwxr-xr-x | gnome2-apps/abiword/BUILD | 7 | ||||
| -rwxr-xr-x | gnome2-apps/abiword/DETAILS | 9 | ||||
| -rw-r--r-- | gnome2-apps/abiword/HISTORY | 4 | ||||
| -rw-r--r-- | gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig | bin | 0 -> 280 bytes | |||
| -rwxr-xr-x | video-libs/x264/DEPENDS | 6 | ||||
| -rw-r--r-- | video-libs/x264/HISTORY | 3 |
6 files changed, 21 insertions, 8 deletions
diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD index 0b084106fb..5ce2c6cec6 100755 --- a/gnome2-apps/abiword/BUILD +++ b/gnome2-apps/abiword/BUILD @@ -1,6 +1,7 @@ -cd abi && - -sedit "s/-pedantic -ansi//g" configure && +if [ "$DEVEL" == "n" ]; then +cd abi && +sedit "s/-pedantic -ansi//g" configure +fi && if [ "$THREADS" == "y" ]; then OPTS="$OPTS --enable-threads" diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS index 57103bab68..3b737db0fb 100755 --- a/gnome2-apps/abiword/DETAILS +++ b/gnome2-apps/abiword/DETAILS @@ -1,15 +1,16 @@ SPELL=abiword if [ "$DEVEL" == "y" ] ;then - VERSION=2.4.6 - SOURCE=$SPELL-$VERSION.tar.bz2 + VERSION=2.5.1 + SOURCE=$SPELL-$VERSION.tar.gz + SOURCE_URL[0]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE else VERSION=2.4.6 SOURCE=$SPELL-$VERSION.tar.bz2 + SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE + SOURCE_URL[1]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE fi SOURCE_GPG="gurus.gpg:${SOURCE}.sig" SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_URL[1]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE LICENSE[0]=GPL WEB_SITE=http://www.abisource.com ENTERED=20030429 diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY index aaa059b178..e4c26e3ff7 100644 --- a/gnome2-apps/abiword/HISTORY +++ b/gnome2-apps/abiword/HISTORY @@ -1,3 +1,7 @@ +2007-02-25 George Sherwood <george@beernabeer.com> + * DETAILS: Updated devel version to 2.5.1 + * BUILD: Added conditional for non-devel version + 2006-11-07 George Sherwood <george@beernabeer.com> * DETAILS: Updated VERSION to 2.4.6 diff --git a/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig b/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig Binary files differnew file mode 100644 index 0000000000..527b6bc78d --- /dev/null +++ b/gnome2-apps/abiword/abiword-2.5.1.tar.gz.sig diff --git a/video-libs/x264/DEPENDS b/video-libs/x264/DEPENDS index 5197409398..5fedbf123a 100755 --- a/video-libs/x264/DEPENDS +++ b/video-libs/x264/DEPENDS @@ -1,3 +1,7 @@ -depends nasm && +if [[ ${SMGL_COMPAT_ARCHS[1]} = x86_64 ]]; then + depends yasm +else + depends nasm +fi && optional_depends "gtk+2" "--enable-gtk" "--disable-gtk" "build gui frontend" diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY index 473c3ab057..5a061023c2 100644 --- a/video-libs/x264/HISTORY +++ b/video-libs/x264/HISTORY @@ -1,3 +1,6 @@ +2007-02-25 Arwed v. Merkatz <v.merkatz@gmx.net> + * DEPENDS: depends on yasm instead of nasm on x86_64, bug #13566 + 2007-01-01 George Sherwood <george@beernabeer.com> * DETAILS: Updated to 20070101-2245 |