Skip to content

Commit

Permalink
Arreglos varios por actualizacion slackware
Browse files Browse the repository at this point in the history
  • Loading branch information
wifislax-ng committed Nov 16, 2015
1 parent bec417b commit 92afcc0
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 82 deletions.
4 changes: 2 additions & 2 deletions Desarrollo/bluefish_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151116

############################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand All @@ -29,7 +29,7 @@ F_variables() {
F_compilar(){
echo ""
echo "$VERDE"Configurando ..."$CIERRE"
sleep 3
sleep 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
Expand Down
6 changes: 3 additions & 3 deletions Desarrollo/gambas_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151102
SCRIPT_VERSION=20151116

############################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand Down Expand Up @@ -32,7 +32,7 @@ F_variables() {
F_compilar(){
echo ""
echo "$VERDE"Descomprimiendo ..."$CIERRE"
sleep 3
sleep 1
rm -rf $PRGNAM_FULL-$VERSION
tar xvf $SOURCES
cd $PRGNAM_FULL-$VERSION
Expand All @@ -41,7 +41,7 @@ chown -R root:root .
# Compilamos paquete
echo ""
echo "$VERDE"Compilando ..."$CIERRE"
sleep 3
sleep 1

./reconf-all

Expand Down
4 changes: 2 additions & 2 deletions Funciones/funciones_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

FUNCIONES_VERSION=20151115
FUNCIONES_VERSION=20151116

# Colores
CIERRE=${CIERRE:-""}
Expand Down Expand Up @@ -244,7 +244,7 @@ f_preparar(){
tar xvf $SOURCES || tar xvf $SRCNAM-$VERSION.$EXTENSION || tar xvf $PRGNAM-src-$VERSION.$EXTENSION
fi
fi
cd $TMP/$PRGNAM-$VERSION 2>/dev/null || cd $TMP/$SRCNAM-$VERSION 2>/dev/null || cd $TMP/$PRGNAM 2>/dev/null || cd $TMP/$PRGNAM-$VERSION-$SRCNAM 2>/dev/null || cd $TMP/$SRCNAM 2>/dev/null
cd $TMP/$PRGNAM-$VERSION 2>/dev/null || cd $TMP/$SRCNAM-$VERSION 2>/dev/null || cd $TMP/$PRGNAM 2>/dev/null || cd $TMP/$PRGNAM-$VERSION-$SRCNAM 2>/dev/null || cd $TMP/$SRCNAM 2>/dev/null || cd $TMP/$PRGNAM-$SRCNAM-$VERSION 2>/dev/null
fi
chown -R root:root .
find -L . \
Expand Down
39 changes: 37 additions & 2 deletions Librerias/ffmpeg_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151116

############################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand All @@ -27,6 +27,41 @@ F_variables() {

# Descomprimimos el fichero descargado y compilamos
F_compilar(){
# Parche necesario por libvpx-1.5
echo "RnJvbSA2NTQwZmUwNGEzZjlhMTFiYTcwODRhNDliM2VlNWZhMmZjNWIzMmFiIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBKYW1lcyBaZXJuIDxqemVybkBnb29nbGUuY29tPgpEYXRlOiBN
b24sIDE5IE9jdCAyMDE1IDIyOjQ0OjExIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gbGlidnB4ZW5j
OiByZW1vdmUgc29tZSB1bnVzZWQgY3RybCBpZCBtYXBwaW5ncwoKVlA4RV9VUERfRU5UUk9QWSwg
VlA4RV9VUERfUkVGRVJFTkNFLCBWUDhFX1VTRV9SRUZFUkVOQ0Ugd2VyZSByZW1vdmVkCmZyb20g
bGlidnB4IGFuZCB0aGUgcmVtYWluaW5nIHZhbHVlcyB3ZXJlIG5ldmVyIHVzZWQgaGVyZQoKUmV2
aWV3ZWQtYnk6IE1pY2hhZWwgTmllZGVybWF5ZXIgPG1pY2hhZWxAbmllZGVybWF5ZXIuY2M+ClNp
Z25lZC1vZmYtYnk6IEphbWVzIFplcm4gPGp6ZXJuQGdvb2dsZS5jb20+Ci0tLQogbGliYXZjb2Rl
Yy9saWJ2cHhlbmMuYyB8ICAgIDggLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4IGRlbGV0aW9u
cygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMvbGlidnB4ZW5jLmMgYi9saWJhdmNvZGVjL2xp
YnZweGVuYy5jCmluZGV4IDVmMzk3ODMuLjk5MjEyMmMgMTAwNjQ0Ci0tLSBhL2xpYmF2Y29kZWMv
bGlidnB4ZW5jLmMKKysrIGIvbGliYXZjb2RlYy9saWJ2cHhlbmMuYwpAQCAtMTA0LDE5ICsxMDQs
MTEgQEAgdHlwZWRlZiBzdHJ1Y3QgVlA4RW5jb2RlckNvbnRleHQgewogCiAvKiogU3RyaW5nIG1h
cHBpbmdzIGZvciBlbnVtIHZwOGVfZW5jX2NvbnRyb2xfaWQgKi8KIHN0YXRpYyBjb25zdCBjaGFy
ICpjb25zdCBjdGxpZHN0cltdID0gewotICAgIFtWUDhFX1VQRF9FTlRST1BZXSAgICAgICAgICAg
PSAiVlA4RV9VUERfRU5UUk9QWSIsCi0gICAgW1ZQOEVfVVBEX1JFRkVSRU5DRV0gICAgICAgICA9
ICJWUDhFX1VQRF9SRUZFUkVOQ0UiLAotICAgIFtWUDhFX1VTRV9SRUZFUkVOQ0VdICAgICAgICAg
PSAiVlA4RV9VU0VfUkVGRVJFTkNFIiwKLSAgICBbVlA4RV9TRVRfUk9JX01BUF0gICAgICAgICAg
ID0gIlZQOEVfU0VUX1JPSV9NQVAiLAotICAgIFtWUDhFX1NFVF9BQ1RJVkVNQVBdICAgICAgICAg
PSAiVlA4RV9TRVRfQUNUSVZFTUFQIiwKLSAgICBbVlA4RV9TRVRfU0NBTEVNT0RFXSAgICAgICAg
ID0gIlZQOEVfU0VUX1NDQUxFTU9ERSIsCiAgICAgW1ZQOEVfU0VUX0NQVVVTRURdICAgICAgICAg
ICA9ICJWUDhFX1NFVF9DUFVVU0VEIiwKICAgICBbVlA4RV9TRVRfRU5BQkxFQVVUT0FMVFJFRl0g
ID0gIlZQOEVfU0VUX0VOQUJMRUFVVE9BTFRSRUYiLAogICAgIFtWUDhFX1NFVF9OT0lTRV9TRU5T
SVRJVklUWV0gPSAiVlA4RV9TRVRfTk9JU0VfU0VOU0lUSVZJVFkiLAotICAgIFtWUDhFX1NFVF9T
SEFSUE5FU1NdICAgICAgICAgPSAiVlA4RV9TRVRfU0hBUlBORVNTIiwKICAgICBbVlA4RV9TRVRf
U1RBVElDX1RIUkVTSE9MRF0gID0gIlZQOEVfU0VUX1NUQVRJQ19USFJFU0hPTEQiLAogICAgIFtW
UDhFX1NFVF9UT0tFTl9QQVJUSVRJT05TXSAgPSAiVlA4RV9TRVRfVE9LRU5fUEFSVElUSU9OUyIs
Ci0gICAgW1ZQOEVfR0VUX0xBU1RfUVVBTlRJWkVSXSAgICA9ICJWUDhFX0dFVF9MQVNUX1FVQU5U
SVpFUiIsCiAgICAgW1ZQOEVfU0VUX0FSTlJfTUFYRlJBTUVTXSAgICA9ICJWUDhFX1NFVF9BUk5S
X01BWEZSQU1FUyIsCiAgICAgW1ZQOEVfU0VUX0FSTlJfU1RSRU5HVEhdICAgICA9ICJWUDhFX1NF
VF9BUk5SX1NUUkVOR1RIIiwKICAgICBbVlA4RV9TRVRfQVJOUl9UWVBFXSAgICAgICAgID0gIlZQ
OEVfU0VUX0FSTlJfVFlQRSIsCi0tIAoxLjcuMTAuNAoK" | base64 -d > $TPM/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch
patch -p1 < $TPM/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch || exit 1

chown -R root:root .
chmod -R u+w,go+r-w,a-s .

Expand Down Expand Up @@ -123,4 +158,4 @@ F_compilar
#Hacemos strip sobre el paquete
f_strip
#Creamos xzm , instalamos y salimos
f_tareasFinales
f_tareasFinales
105 changes: 68 additions & 37 deletions Multimedia/audacity_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151115
CATEGORIA="Editores de audio"

############################################################
Expand All @@ -17,15 +17,14 @@ f_variables(){
############################################################
# Definicion de variables
F_variables() {
WEB=http://sourceforge.net/projects/audacity/files/audacity/
#VERSION=`curl -s $WEB | grep -m 1 "<tr title="|cut -d '"' -f2| sed "s/ //g"`
VERSION=2.1.0
PRGNAM=audacity
SRCNAM=Audacity
echo -ne "\033]2;${PRGNAM}_updater\007"
EXTENSION=tar.xz
SOURCES=$PRGNAM-src-$VERSION.$EXTENSION
SRCNAM=$PRGNAM-src-$VERSION
DOWNLOAD=http://ponce.cc/slackware/sources/repo/$SRCNAM.tar.xz
WEB=https://github.com/audacity/audacity/releases
VERSION=`curl -s $WEB|grep [0-9].tar.gz|head -1|cut -d- -f2|cut -d t -f-1|sed 's/.$//g'`
EXTENSION=tar.gz
SOURCES=$SRCNAM-$VERSION.$EXTENSION
DOWNLOAD=https://github.com/audacity/audacity/archive/$SOURCES
}

# Comprobar dependencias
Expand All @@ -35,49 +34,81 @@ f_dependencias
}

# Descomprimimos el fichero descargado y compilamos
F_compilar(){
# Fix vamp plugin search path on x86_64 - thanks to B. Watson
sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \
lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp

# Renombramos temporalmente este fichero y al acabar lo devolvemos
if [ -f /usr/lib/libvamp-hostsdk.la ]; then
mv -f /usr/lib/libvamp-hostsdk.la /usr/lib/libvamp-hostsdk.la.RENOMBRADO
fi

F_compilar(){
# Configuramos paquete
echo ""
echo "$VERDE"Configurando ..."$CIERRE"
sleep 3
sleep 1

if [ -x /usr/bin/listplugins ]; then do_ladspa="--with-ladspa"; else do_ladspa="--without-ladspa"; fi
if pkg-config --exists libavcodec; then do_ffmpeg="-ffmpeg=system"; else do_ffmpeg="out-ffmpeg"; fi
if pkg-config --exists soundtouch; then do_soundtouch="-soundtouch=system"; else do_soundtouch="out-soundtouch"; fi
if pkg-config --exists twolame; then do_twolame="-libtwolame=system"; else do_twolame="out-libtwolame"; fi
if pkg-config --exists vamp-hostsdk; then do_vamp="-libvamp=system"; else do_vamp="out-libvamp"; fi
if $(pkg-config --exists lilv-0) && $(pkg-config --exists suil-0); then do_lv2="-lv2=system"; else do_lv2="out-lv2"; fi

# fix vamp plugin search path on x86_64 - thanks to B. Watson
sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \
lib-src/libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp || true

# Patch
echo "ZGlmZiAtTmF1ciBhdWRhY2l0eS1zcmMtMi4wLjYtb3JpZy9zcmMvRkZtcGVnLmggYXVkYWNpdHkt
c3JjLTIuMC42L3NyYy9GRm1wZWcuaAotLS0gYXVkYWNpdHktc3JjLTIuMC42LW9yaWcvc3JjL0ZG
bXBlZy5oCTIwMTQtMDktMjggMjE6NTQ6NTUuMTU5NjM2MjA4IC0wNDAwCisrKyBhdWRhY2l0eS1z
cmMtMi4wLjYvc3JjL0ZGbXBlZy5oCTIwMTQtMDktMjggMjE6NTU6MTEuMjQ2Mjc2NzY2IC0wNDAw
CkBAIC02ODgsNyArNjg4LDcgQEAKICAgIEZGTVBFR19GVU5DVElPTl9XSVRIX1JFVFVSTigKICAg
ICAgIEFWT3V0cHV0Rm9ybWF0KiwKICAgICAgIGF2X29mb3JtYXRfbmV4dCwKLSAgICAgIChBVk91
dHB1dEZvcm1hdCAqZiksCisgICAgICAoY29uc3QgQVZPdXRwdXRGb3JtYXQgKmYpLAogICAgICAg
KGYpCiAgICApOwogICAgRkZNUEVHX0ZVTkNUSU9OX1dJVEhfUkVUVVJOKApAQCAtNzU1LDcgKzc1
NSw3IEBACiAgICBGRk1QRUdfRlVOQ1RJT05fV0lUSF9SRVRVUk4oCiAgICAgICBpbnQsCiAgICAg
ICBhdl9maWZvX3NpemUsCi0gICAgICAoQVZGaWZvQnVmZmVyICpmKSwKKyAgICAgIChjb25zdCBB
VkZpZm9CdWZmZXIgKmYpLAogICAgICAgKGYpCiAgICApOwogICAgRkZNUEVHX0ZVTkNUSU9OX1dJ
VEhfUkVUVVJOKApAQCAtODAxLDcgKzgwMSw3IEBACiAgICBGRk1QRUdfRlVOQ1RJT05fV0lUSF9S
RVRVUk4oCiAgICAgICBBVkRpY3Rpb25hcnlFbnRyeSAqLAogICAgICAgYXZfZGljdF9nZXQsCi0g
ICAgICAoQVZEaWN0aW9uYXJ5ICptLCBjb25zdCBjaGFyICprZXksIGNvbnN0IEFWRGljdGlvbmFy
eUVudHJ5ICpwcmV2LCBpbnQgZmxhZ3MpLAorICAgICAgKGNvbnN0IEFWRGljdGlvbmFyeSAqbSwg
Y29uc3QgY2hhciAqa2V5LCBjb25zdCBBVkRpY3Rpb25hcnlFbnRyeSAqcHJldiwgaW50IGZsYWdz
KSwKICAgICAgIChtLCBrZXksIHByZXYsIGZsYWdzKQogICAgKTsKICAgIEZGTVBFR19GVU5DVElP
Tl9XSVRIX1JFVFVSTigK" | base64 -d > $TMP/audacity-ffmpeg.patch
patch -p1 < $TMP/audacity-ffmpeg.patch

# libsoxr is the new default resampling library
LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
WX_CONFIG=/usr/bin/wx-config-2.8 ./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--disable-dynamic-loading \
--with-libvamp \
--enable-unicode \
--enable-nyquist \
--enable-vamp \
--with-expat \
--with-libvorbis \
--with-libmad \
--with-libflac \
--with-libsndfile \
--with-libid3tag \
--with-libresample \
--with-ffmpeg \
--with-soundtouch \
--with-libtwolame
--with-expat=system \
--with-libvorbis=system \
--with-libmad=system \
--with-libflac=system \
--with-libsndfile=system \
--with-libid3tag=system \
--with-libsoxr \
--with-portaudio \
$do_ladspa \
--with$do_ffmpeg \
--with$do_lv2 \
--with$do_soundtouch \
--with$do_twolame \
--with$do_vamp \
--without-libresample \
--without-libsamplerate

# ensure we use the system headers for these: note that we do this after the
# configure as this last wants to run sub-configures in these dirs
for i in ffmpeg expat libid3tag libflac libmad libresample libsndfile libvamp lv2 soundtouch twolame; do
rm -rf lib-src/$i
done

echo ""
echo "$VERDE"Compilamos ..."$CIERRE"
sleep 1
make || exit 1
make install DESTDIR=$PKG

# Devolvemos el fichero renombrado anteriormente
if [ -f /usr/lib/libvamp-hostsdk.la.RENOMBRADO ]; then
mv -f /usr/lib/libvamp-hostsdk.la.RENOMBRADO /usr/lib/libvamp-hostsdk.la
fi
}

###################################
Expand Down
22 changes: 11 additions & 11 deletions Sistema/firmwares_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151115

############################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand Down Expand Up @@ -41,20 +41,20 @@ rm -Rf $TMP/linux-firmware/README
rm -Rf $TMP/linux-firmware/Makefile
rm -Rf $TMP/linux-firmware/GPL-3
rm -Rf $TMP/linux-firmware/configure
rm -Rf $TMP/linux-firmware/htc_7010.fw
rm -Rf $TMP/linux-firmware/htc_9271.fw
#rm -Rf $TMP/linux-firmware/htc_7010.fw
#rm -Rf $TMP/linux-firmware/htc_9271.fw
mkdir -p $PKG/lib/firmware
mv $TMP/linux-firmware/* $PKG/lib/firmware/

# Aqui conseguimos las ulimas version de firmware para chips atheros usb
if [ -d $TMP/ath9k-htc-firmware-blob ]; then
rm -rf $TMP/ath9k-htc-firmware-blob
fi
echo "$AMARILLO"
git clone https://github.com/olerem/ath9k-htc-firmware-blob
mv $TMP/ath9k-htc-firmware-blob/htc_7010.fw $PKG/lib/firmware/
mv $TMP/ath9k-htc-firmware-blob/htc_9271.fw $PKG/lib/firmware/
echo "$CIERRE"
#if [ -d $TMP/ath9k-htc-firmware-blob ]; then
#rm -rf $TMP/ath9k-htc-firmware-blob
#fi
#echo "$AMARILLO"
#git clone https://github.com/olerem/ath9k-htc-firmware-blob
#mv $TMP/ath9k-htc-firmware-blob/htc_7010.fw $PKG/lib/firmware/
#mv $TMP/ath9k-htc-firmware-blob/htc_9271.fw $PKG/lib/firmware/
#echo "$CIERRE"
}

###################################
Expand Down
42 changes: 20 additions & 22 deletions Sistema/hardinfo_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151116

#################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand All @@ -16,34 +16,34 @@ f_variables(){
############################################################
# Definicion de variables
F_variables(){
WEB=http://sourceforge.net/projects/hardinfo.berlios/files/
VERSION=`curl -s $WEB | grep /latest | cut -d "/" -f 7 | cut -d- -f2 | cut -d "." -f-3`
PRGNAM=hardinfo
echo -ne "\033]2;${PRGNAM}_updater\007"
EXTENSION=tar.bz2
SOURCES=$PRGNAM-$VERSION.$EXTENSION
WEB=https://github.com/lpereira/hardinfo
VERSION=$(curl -s $WEB/blob/master/CMakeLists.txt|grep HARDINFO_VERSION|cut -d ';' -f2|cut -d '&' -f-1)_$(curl -s $WEB|grep commit/|head -1|rev|cut -d / -f1|cut -d '"' -f2|rev|cut -c-6)
DOWNLOAD=$WEB/$SOURCES
}

# Git clone
F_download(){
echo ""
echo "$VERDE"Descargando sources de ${AMARILLO}$PRGNAM-$VERSION${BLANCO}..."$CIERRE"
sleep 1
cd $TMP
git clone $WEB
}

# Compilamos
F_compilar(){
sed -i "s|share/man|man|" configure

CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
--build=$ARCH-slackware-linux

echo ""
echo "$VERDE"Compilamos${BLANCO}..."$CIERRE"
sleep 1
cd $TMP/$PRGNAM
mkdir build
cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make || exit 1
make install DESTDIR=$PKG

rm -rf $PKG/usr/local

# Entrada desktop
rm -rf $PKG/usr/share/applications/hardinfo.desktop
mkdir -p $PKG/usr/share/pixmaps
Expand Down Expand Up @@ -81,9 +81,7 @@ f_arquitectura
#Comprobamos version instalada del script
f_versionInstalada
#Si no existe el fichero se descargara
f_download
#Preparamos entorno
f_preparar
F_download
#Creamos la entrada al menu
F_compilar
#Hacemos strip sobre el paquete
Expand Down
6 changes: 3 additions & 3 deletions Sistema/keepassx_updater
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Script by www.seguridadwireless.net

SCRIPT_VERSION=20151024
SCRIPT_VERSION=20151116

############################################################
## Funciones comunes. Su nombre empieza por f_ ##
Expand All @@ -16,10 +16,10 @@ f_variables(){
############################################################
# Definicion de variables
F_variables() {
WEB=http://sourceforge.net/projects/keepassx/files/KeePassX/
VERSION=`curl -s $WEB | grep /latest | cut -d '/' -f 8 | cut -d ":" -f 1 | cut -d '-' -f 2`
PRGNAM=keepassx
echo -ne "\033]2;${PRGNAM}_updater\007"
WEB=https://www.keepassx.org/releases/
VERSION=`curl -s $WEB|grep [0-9].tar.gz|head -1|cut -d- -f2|cut -d t -f-1|sed 's/.$//g'`
EXTENSION=tar.gz
SOURCES=$PRGNAM-$VERSION.$EXTENSION
DOWNLOAD=$WEB$VERSION/$SOURCES
Expand Down

0 comments on commit 92afcc0

Please sign in to comment.