updated surfraw

KeithDHedger · May 13, 2017 · 17171fe · 17171fe
1 parent c1b9b9d
commit 17171fe
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 23 deletions.
diff --git a/LFSPkgBuildScripts/devel/ManPageEditor/ManPageEditor.LFSBuild b/LFSPkgBuildScripts/devel/ManPageEditor/ManPageEditor.LFSBuild
@@ -9,7 +9,7 @@ fi
 
 PKGNAME="ManPageEditor"
 TARNAME="$PKGNAME"
-VERSION="0.1.0"
+VERSION="0.0.18"
 BUILD=${BUILD:-1}
 SECTION="DEVEL"
 SUFFIX="LFSPKG"

diff --git a/LFSPkgBuildScripts/mm/gst-libav1.0/gst-libav1.0.LFSBuild b/LFSPkgBuildScripts/mm/gst-libav1.0/gst-libav1.0.LFSBuild
@@ -9,7 +9,7 @@ fi
 
 PKGNAME="gst-libav1.0"
 TARNAME="gst-libav"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"

diff --git a/LFSPkgBuildScripts/mm/gst-plugins-bad1.0/gst-plugins-bad1.0.LFSBuild b/LFSPkgBuildScripts/mm/gst-plugins-bad1.0/gst-plugins-bad1.0.LFSBuild
@@ -9,13 +9,14 @@ fi
 
 PKGNAME="gst-plugins-bad1.0"
 TARNAME="gst-plugins-bad"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="SYS"
 SUFFIX="LFSPKG"
 TARBALL="${TARNAME}-${VERSION}.tar.xz"
+
+scriptLog "${PKGNAME}-${VERSION}"
 gettar "http://gstreamer.freedesktop.org/src/gst-plugins-bad/${TARBALL}" $SECTION
-gettar "http://www.linuxfromscratch.org/patches/blfs/7.8/${TARNAME}-${VERSION}-openjpeg21-1.patch" $SECTION
 
 PKG="${OUTPUT}/${PKGNAME}"
 
@@ -25,8 +26,7 @@ mkdir -p "$PKG"
 tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
 
 pushd "${TARNAME}-${VERSION}"
-	patch -Np1 -i${SOURCEARCHIVES}/${SECTION}/${TARNAME}-${VERSION}-openjpeg21-1.patch
-	CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure --prefix=/usr --with-package-name="GStreamer Bad Plugins ${VERSION} BLFS" --with-package-origin="http://www.linuxfromscratch.org/blfs/view/stable/"
+	CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure --prefix=/usr --disable-wayland --disable-opencv --with-package-name="GStreamer Bad Plugins ${VERSION} BLFS" --with-package-origin="http://www.linuxfromscratch.org/blfs/view/stable/"
 	make $MAKEFLAGS||make|| exit 1
 	make install DESTDIR=$PKG || exit 1
 popd

diff --git a/LFSPkgBuildScripts/mm/gst-plugins-base1.0/gst-plugins-base1.0.LFSBuild b/LFSPkgBuildScripts/mm/gst-plugins-base1.0/gst-plugins-base1.0.LFSBuild
@@ -9,11 +9,13 @@ fi
 
 PKGNAME="gst-plugins-base1.0"
 TARNAME="gst-plugins-base"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"
 TARBALL="${TARNAME}-${VERSION}.tar.xz"
+
+scriptLog "${PKGNAME}-${VERSION}"
 gettar "http://gstreamer.freedesktop.org/src/gst-plugins-base/${TARBALL}" $SECTION
 
 PKG="${OUTPUT}/${PKGNAME}"

diff --git a/LFSPkgBuildScripts/mm/gst-plugins-good1.0/gst-plugins-good1.0.LFSBuild b/LFSPkgBuildScripts/mm/gst-plugins-good1.0/gst-plugins-good1.0.LFSBuild
@@ -9,11 +9,13 @@ fi
 
 PKGNAME="gst-plugins-good1.0"
 TARNAME="gst-plugins-good"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"
 TARBALL="${TARNAME}-${VERSION}.tar.xz"
+
+scriptLog "${PKGNAME}-${VERSION}"
 gettar "http://gstreamer.freedesktop.org/src/gst-plugins-good/${TARBALL}" $SECTION
 
 PKG="${OUTPUT}/${PKGNAME}"

diff --git a/LFSPkgBuildScripts/mm/gst-plugins-ugly1.0/gst-plugins-ugly1.0.LFSBuild b/LFSPkgBuildScripts/mm/gst-plugins-ugly1.0/gst-plugins-ugly1.0.LFSBuild
@@ -9,7 +9,7 @@ fi
 
 PKGNAME="gst-plugins-ugly1.0"
 TARNAME="gst-plugins-ugly"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"

diff --git a/LFSPkgBuildScripts/mm/gstreamer1.0/gstreamer1.0.LFSBuild b/LFSPkgBuildScripts/mm/gstreamer1.0/gstreamer1.0.LFSBuild
@@ -9,11 +9,13 @@ fi
 
 PKGNAME="gstreamer1.0"
 TARNAME="gstreamer"
-VERSION="1.4.5"
+VERSION="1.10.3"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"
 TARBALL="${TARNAME}-${VERSION}.tar.xz"
+
+scriptLog "${PKGNAME}-${VERSION}"
 gettar "http://gstreamer.freedesktop.org/src/gstreamer/${TARBALL}" $SECTION
 PKG="${TMP}/${PKGNAME}"
 

diff --git a/LFSPkgBuildScripts/mm/mm-meta/mm-meta.LFSBuild b/LFSPkgBuildScripts/mm/mm-meta/mm-meta.LFSBuild
@@ -2,6 +2,15 @@
 
 . /usr/share/LFSPkg/LFSFunctions
 
+PKGNAME="mm-meta"
+VERSION="8.0"
+BUILD=${BUILD:-1}
+SECTION="MM"
+SUFFIX="LFSPKG"
+PKG="${OUTPUT}/${PKGNAME}"
+
+scriptLog "${PKGNAME}-${VERSION}"
+
 DEPENDS="LAME-3.99.5
 Libdvdnav-5.0.3
 libdvdcss-1.3.0
@@ -43,13 +52,6 @@ if ! lfspkg -B "$DEPENDS";then
 	exit 100
 fi
 
-PKGNAME="mm-meta"
-VERSION="0.0.3"
-BUILD=${BUILD:-1}
-SECTION="MM"
-SUFFIX="LFSPKG"
-PKG="${OUTPUT}/${PKGNAME}"
-
 DOWHAT=${1:-"build"}
 rm -rf "$PKG" || true
 mkdir -p "$PKG"

diff --git a/LFSPkgBuildScripts/mm/mp4v2/mp4v2.LFSBuild b/LFSPkgBuildScripts/mm/mp4v2/mp4v2.LFSBuild
@@ -4,7 +4,7 @@
 
 PKGNAME="mp4v2"
 TARNAME="$PKGNAME"
-VERSION="1.9.1"
+VERSION="2.0.0"
 BUILD=${BUILD:-1}
 SECTION="MM"
 SUFFIX="LFSPKG"

diff --git a/LFSPkgBuildScripts/net/surfraw/surfraw.LFSBuild b/LFSPkgBuildScripts/net/surfraw/surfraw.LFSBuild
@@ -4,12 +4,12 @@
 
 PKGNAME="surfraw"
 TARNAME="$PKGNAME"
-VERSION="2.2.9"
+VERSION="9417139"
 BUILD=1
 SECTION="NET"
 SUFFIX="LFSPKG"
 TARBALL="${TARNAME}-${VERSION}.tar.gz"
-gettar "https://surfraw.alioth.debian.org/dist/${TARBALL}" $SECTION
+gettar "https://anonscm.debian.org/gitweb/?p=surfraw/surfraw.git;a=snapshot;h=941713969153b074490112154f21979f7fe6f4df;sf=tgz" $SECTION "${TARBALL}"
 
 PKG="${OUTPUT}/${PKGNAME}"
 
@@ -19,7 +19,8 @@ mkdir -p "$PKG"
 tar -xvf "${SOURCEARCHIVES}/${SECTION}/${TARBALL}"
 
 pushd "${TARNAME}-${VERSION}"
-	CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} --disable-opensearch --with-elvidir=/usr/share/surfraw 
+	autoreconf
+	CFLAGS="$LFSFLAGS" CXXFLAGS="$LFSFLAGS" ./configure ${CONFIGOPTIONS} 
 	make $MAKEFLAGS||make|| exit 1
 	make install DESTDIR=$PKG || exit 1
 popd
@@ -46,4 +47,4 @@ case $DOWHAT in
 		exit 1
 esac
 
-#rm -r "$PKG" "${TARNAME}-${VERSION}"
+rm -r "$PKG" "${TARNAME}-${VERSION}"
diff --git a/LFSScripts/UpdateScriptVersion b/LFSScripts/UpdateScriptVersion
@@ -39,4 +39,4 @@ fi
 while read
 	do
 		sed -r -i "s/\b${NAME}-[0-9\.]+\b/${1}/ig" ${REPLY}
-	done < <(find ${LFS}/LFSPkgBuildScripts -iname "*.LFSBuild")
+	done < <(find ${LFS}/LFSPkgBuildScripts -iname "*.LFSBuild")