Merge branch '3.1' into 3.2

This commit is contained in:
Juergen Daubert 2015-11-20 12:44:44 +01:00
commit 971c66649e
11 changed files with 103 additions and 109 deletions

View File

@ -1,6 +1,7 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/gphoto2
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/gphoto2.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/gphoto2.1.gz

View File

@ -1 +1 @@
bae369aee6881e590c5c91bdbb11a5f8 gphoto2-2.5.8.tar.bz2
66b6444cc4c881d5300fdc1a467dd711 gphoto2-2.5.9.tar.bz2

View File

@ -4,19 +4,17 @@
# Depends on: readline popt libgphoto2
name=gphoto2
version=2.5.8
version=2.5.9
release=1
source=(http://downloads.sourceforge.net/project/gphoto/gphoto/$version/$name-$version.tar.bz2)
build() {
cd $name-$version
./configure --prefix=/usr \
--mandir=/usr/man \
--disable-nls
./configure --prefix=/usr --disable-nls
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share
rm -r $PKG/usr/share/doc
}

View File

@ -32,71 +32,71 @@ lrwxrwxrwx root/root usr/lib/libgphoto2.so -> libgphoto2.so.6.0.0
lrwxrwxrwx root/root usr/lib/libgphoto2.so.6 -> libgphoto2.so.6.0.0
-rwxr-xr-x root/root usr/lib/libgphoto2.so.6.0.0
drwxr-xr-x root/root usr/lib/libgphoto2/
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/adc65.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/agfa_cl20.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/aox.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/ax203.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/barbie.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/canon.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/casio_qv.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/clicksmart310.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/digigr8.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/digita.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/dimagev.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/dimera3500.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/directory.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/enigma13.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/fuji.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/gsmart300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/hp215.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/iclick.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/jamcam.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/jd11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/jl2005a.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/jl2005c.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/kodak_dc120.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/kodak_dc210.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/kodak_dc240.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/kodak_dc3200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/kodak_ez200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/konica.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/konica_qm150.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/largan.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/lg_gsm.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/mars.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/mustek.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/panasonic_coolshot.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/panasonic_dc1000.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/panasonic_dc1580.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/panasonic_l859.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/pccam300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/pccam600.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/pentax.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/polaroid_pdc320.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/polaroid_pdc640.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/polaroid_pdc700.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/ptp2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/ricoh.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/ricoh_g3.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/samsung.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sierra.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sipix_blink2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sipix_web2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/smal.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sonix.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sony_dscf1.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sony_dscf55.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/soundvision.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/spca50x.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sq905.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/st2205.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/stv0674.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/stv0680.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/sx330z.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/topfield.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/toshiba_pdrm11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.8/tp6801.so
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/adc65.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/agfa_cl20.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/aox.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/ax203.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/barbie.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/canon.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/casio_qv.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/clicksmart310.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/digigr8.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/digita.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/dimagev.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/dimera3500.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/directory.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/enigma13.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/fuji.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/gsmart300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/hp215.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/iclick.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/jamcam.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/jd11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/jl2005a.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/jl2005c.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/kodak_dc120.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/kodak_dc210.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/kodak_dc240.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/kodak_dc3200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/kodak_ez200.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/konica.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/konica_qm150.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/largan.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/lg_gsm.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/mars.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/mustek.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/panasonic_coolshot.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/panasonic_dc1000.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/panasonic_dc1580.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/panasonic_l859.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/pccam300.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/pccam600.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/pentax.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/polaroid_pdc320.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/polaroid_pdc640.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/polaroid_pdc700.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/ptp2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/ricoh.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/ricoh_g3.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/samsung.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sierra.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sipix_blink2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sipix_web2.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/smal.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sonix.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sony_dscf1.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sony_dscf55.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/soundvision.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/spca50x.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sq905.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/st2205.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/stv0674.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/stv0680.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/sx330z.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/topfield.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/toshiba_pdrm11.so
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.9/tp6801.so
-rwxr-xr-x root/root usr/lib/libgphoto2/print-camera-list
-rwxr-xr-x root/root usr/lib/libgphoto2_port.la
lrwxrwxrwx root/root usr/lib/libgphoto2_port.so -> libgphoto2_port.so.12.0.0
@ -113,17 +113,17 @@ drwxr-xr-x root/root usr/lib/libgphoto2_port/0.12.0/
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2_port.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/libgphoto2.3.gz
-rw-r--r-- root/root usr/man/man3/libgphoto2_port.3.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/libgphoto2/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.8/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.8/konica/
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/english
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/french
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/german
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/japanese
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/korean
-rw-r--r-- root/root usr/share/libgphoto2/2.5.8/konica/spanish
drwxr-xr-x root/root usr/share/libgphoto2/2.5.9/
drwxr-xr-x root/root usr/share/libgphoto2/2.5.9/konica/
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/english
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/french
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/german
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/japanese
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/korean
-rw-r--r-- root/root usr/share/libgphoto2/2.5.9/konica/spanish
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/libgphoto2.3.gz
-rw-r--r-- root/root usr/share/man/man3/libgphoto2_port.3.gz

View File

@ -1 +1 @@
873ab01aced49c6b92a98e515db5dcef libgphoto2-2.5.8.tar.bz2
9b17521ac7fa9d13146d62917cd67a09 libgphoto2-2.5.9.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: libtool libusb-compat libjpeg-turbo libexif
name=libgphoto2
version=2.5.8
version=2.5.9
release=1
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2)
@ -13,9 +13,7 @@ build () {
cd $name-$version
udevscriptdir=/lib/udev \
./configure --prefix=/usr \
--disable-nls \
--mandir=/usr/man
./configure --prefix=/usr --disable-nls
make
make DESTDIR=$PKG install

View File

@ -1,2 +1,2 @@
9e6a9aca9d155737868b3dc5fd82f788 libxml2-2.9.2.tar.gz
daece17e045f1c107610e137ab50c179 libxml2-2.9.3.tar.gz
80fdb13ebd1e5d320783dc94d8b9c6d7 libxml2-python-config.patch

View File

@ -4,7 +4,7 @@
# Depends on: python libxml2
name=libxml2-python
version=2.9.2
version=2.9.3
release=1
source=(ftp://xmlsoft.org/libxml2/libxml2-$version.tar.gz \
$name-config.patch)

View File

@ -59,19 +59,19 @@ drwxr-xr-x root/root usr/lib/cmake/libxml2/
-rw-r--r-- root/root usr/lib/cmake/libxml2/libxml2-config.cmake
-rw-r--r-- root/root usr/lib/libxml2.a
-rwxr-xr-x root/root usr/lib/libxml2.la
lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.2
lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.9.2
-rwxr-xr-x root/root usr/lib/libxml2.so.2.9.2
lrwxrwxrwx root/root usr/lib/libxml2.so -> libxml2.so.2.9.3
lrwxrwxrwx root/root usr/lib/libxml2.so.2 -> libxml2.so.2.9.3
-rwxr-xr-x root/root usr/lib/libxml2.so.2.9.3
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libxml-2.0.pc
-rw-r--r-- root/root usr/lib/xml2Conf.sh
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/xml2-config.1.gz
-rw-r--r-- root/root usr/man/man1/xmlcatalog.1.gz
-rw-r--r-- root/root usr/man/man1/xmllint.1.gz
drwxr-xr-x root/root usr/man/man3/
-rw-r--r-- root/root usr/man/man3/libxml.3.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/aclocal/
-rw-r--r-- root/root usr/share/aclocal/libxml.m4
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/xml2-config.1.gz
-rw-r--r-- root/root usr/share/man/man1/xmlcatalog.1.gz
-rw-r--r-- root/root usr/share/man/man1/xmllint.1.gz
drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/libxml.3.gz

View File

@ -1 +1 @@
9e6a9aca9d155737868b3dc5fd82f788 libxml2-2.9.2.tar.gz
daece17e045f1c107610e137ab50c179 libxml2-2.9.3.tar.gz

View File

@ -5,16 +5,13 @@
# Depends on: zlib
name=libxml2
version=2.9.2
version=2.9.3
release=1
source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz)
build () {
cd $name-$version
./configure --prefix=/usr \
--mandir=/usr/man \
--without-python
./configure --prefix=/usr --without-python
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share/{doc,gtk-doc}