Merge branch '3.2' into 3.3
This commit is contained in:
commit
c19f6c898d
@ -6,6 +6,11 @@ drwxr-xr-x root/root usr/lib/aspell-0.60/
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/american-w_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/american-wo_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/american.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/australian-variant_0.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/australian-variant_1.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/australian-w_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/australian-wo_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/australian.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/british-ise-w_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/british-ise-wo_accents.alias
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/british-ise.alias
|
||||
@ -35,6 +40,15 @@ drwxr-xr-x root/root usr/lib/aspell-0.60/
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en-wo_accents.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en.dat
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-variant_0.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-variant_0.rws
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-variant_1.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-variant_1.rws
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-w_accents-only.rws
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-w_accents.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-wo_accents-only.rws
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU-wo_accents.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_AU.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_CA-variant_0.multi
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_CA-variant_0.rws
|
||||
-rw-r--r-- root/root usr/lib/aspell-0.60/en_CA-variant_1.multi
|
||||
|
||||
@ -1 +1 @@
|
||||
649ab2b179fdf97ab716a83896fd57d7 aspell6-en-2016.06.26-0.tar.bz2
|
||||
ea65cee7f191382720521069e58b63dd aspell6-en-2016.11.20-0.tar.bz2
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: aspell
|
||||
|
||||
name=aspell-en
|
||||
version=2016.06.26-0
|
||||
version=2016.11.20-0
|
||||
release=1
|
||||
source=(http://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$version.tar.bz2)
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
d0598aa8a9be8faccef9386f6fc0d5f2 chrony-2.4.tar.gz
|
||||
d08dd5a7d79a89891d119adcccb4397d chrony-2.4.1.tar.gz
|
||||
4bdea4aea28853c7be54ffdb9f6b87a8 chronyd
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: readline libcap
|
||||
|
||||
name=chrony
|
||||
version=2.4
|
||||
version=2.4.1
|
||||
release=1
|
||||
source=(http://download.tuxfamily.org/$name/$name-$version.tar.gz
|
||||
chronyd)
|
||||
|
||||
@ -1 +1 @@
|
||||
7b3d0e721f6c1a151c6b9e130223d934 gphoto2-2.5.10.tar.bz2
|
||||
a62a51474a681aca51b087905deb5e35 gphoto2-2.5.11.tar.bz2
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: readline popt libgphoto2
|
||||
|
||||
name=gphoto2
|
||||
version=2.5.10
|
||||
version=2.5.11
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/gphoto/gphoto/$version/$name-$version.tar.bz2)
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
drwxr-xr-x root/root usr/
|
||||
drwxr-xr-x root/root usr/bin/
|
||||
-rwxr-xr-x root/root usr/bin/iperf
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/iperf.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/iperf.1.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
44b5536b67719f4250faed632a3cd016 iperf-2.0.5.tar.gz
|
||||
351b018b71176b8cb25f20eef6a9e37c iperf-2.0.9.tar.gz
|
||||
|
||||
@ -1,18 +1,17 @@
|
||||
# Description: Network bandwidth measurement tool
|
||||
# URL: http://sourceforge.net/projects/iperf/
|
||||
# URL: http://sourceforge.net/projects/iperf2/
|
||||
# Maintainer: Alan Mizrahi, alan at mizrahi dot com dot ve
|
||||
# Depends on:
|
||||
|
||||
name=iperf
|
||||
version=2.0.5
|
||||
version=2.0.9
|
||||
release=1
|
||||
source=(http://prdownloads.sf.net/$name/$name-$version.tar.gz)
|
||||
source=(https://downloads.sourceforge.net/sourceforge/iperf2/files/$name-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man
|
||||
--prefix=/usr
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
}
|
||||
|
||||
@ -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.10/
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/adc65.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/agfa_cl20.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/aox.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ax203.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/barbie.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/canon.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/casio_qv.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/clicksmart310.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digigr8.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/digita.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimagev.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/dimera3500.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/directory.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/enigma13.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/fuji.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/gsmart300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/hp215.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/iclick.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jamcam.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jd11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005a.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/jl2005c.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc120.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc210.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc240.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_dc3200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/kodak_ez200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/konica_qm150.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/largan.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/lg_gsm.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mars.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/mustek.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_coolshot.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1000.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_dc1580.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/panasonic_l859.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pccam600.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/pentax.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc320.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc640.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/polaroid_pdc700.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ptp2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/ricoh_g3.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/samsung.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sierra.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_blink2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sipix_web2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/smal.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sonix.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf1.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sony_dscf55.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/soundvision.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/spca50x.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sq905.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/st2205.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0674.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/stv0680.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/sx330z.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/topfield.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/toshiba_pdrm11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.10/tp6801.so
|
||||
drwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/adc65.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/agfa_cl20.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/aox.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ax203.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/barbie.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/canon.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/casio_qv.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/clicksmart310.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digigr8.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/digita.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimagev.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/dimera3500.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/directory.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/enigma13.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/fuji.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/gsmart300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/hp215.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/iclick.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jamcam.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jd11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005a.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/jl2005c.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc120.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc210.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc240.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_dc3200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/kodak_ez200.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/konica_qm150.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/largan.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/lg_gsm.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mars.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/mustek.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_coolshot.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1000.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_dc1580.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/panasonic_l859.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam300.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pccam600.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/pentax.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc320.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc640.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/polaroid_pdc700.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ptp2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/ricoh_g3.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/samsung.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sierra.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_blink2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sipix_web2.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/smal.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sonix.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf1.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sony_dscf55.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/soundvision.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/spca50x.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sq905.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/st2205.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0674.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/stv0680.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/sx330z.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/topfield.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/toshiba_pdrm11.so
|
||||
-rwxr-xr-x root/root usr/lib/libgphoto2/2.5.11/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
|
||||
@ -116,14 +116,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libgphoto2_port.pc
|
||||
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.10/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.10/konica/
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/english
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/french
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/german
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/japanese
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/korean
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.10/konica/spanish
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2/2.5.11/konica/
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/english
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/french
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/german
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/japanese
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/korean
|
||||
-rw-r--r-- root/root usr/share/libgphoto2/2.5.11/konica/spanish
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/
|
||||
drwxr-xr-x root/root usr/share/libgphoto2_port/0.12.0/vcamera/
|
||||
|
||||
@ -1,2 +1 @@
|
||||
04132b5a9a650929cef68b7eb360a057 jpeg-1.5.0.patch
|
||||
f1e53e684a3ea51cc7958d7e4eee7f37 libgphoto2-2.5.10.tar.bz2
|
||||
2426511143e6f2fae4f3744e91acfbc3 libgphoto2-2.5.11.tar.bz2
|
||||
|
||||
@ -5,14 +5,12 @@
|
||||
# Depends on: libtool libusb-compat libjpeg-turbo libexif
|
||||
|
||||
name=libgphoto2
|
||||
version=2.5.10
|
||||
release=2
|
||||
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2
|
||||
jpeg-1.5.0.patch)
|
||||
version=2.5.11
|
||||
release=1
|
||||
source=(http://downloads.sourceforge.net/project/gphoto/libgphoto/$version/$name-$version.tar.bz2)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p1 -i $SRC/jpeg-1.5.0.patch
|
||||
|
||||
udevscriptdir=/lib/udev \
|
||||
./configure --prefix=/usr --disable-nls
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Ohly <patrick.ohly@intel.com>
|
||||
Date: Wed, 15 Jun 2016 10:33:24 +0200
|
||||
Subject: [PATCH] jpeg_memsrcdest: extend feature check
|
||||
|
||||
libjpeg.h in OpenEmbedded master (from libjpeg-turbo 1.5.0) provides
|
||||
these methods if "JPEG_LIB_VERSION >= 80 ||
|
||||
defined(MEM_SRCDST_SUPPORTED)".
|
||||
|
||||
The support for the jpeg_mem functions was added even when not
|
||||
emulating the libjpeg8 API, controlled via the MEM_SRCDST_SUPPORTED
|
||||
define, so checking for the version alone is not enough anymore.
|
||||
|
||||
See https://github.com/libjpeg-turbo/libjpeg-turbo/commit/ab70623eb29e09e67222be5b9e1ea320fe5aa0e9
|
||||
|
||||
This fixes errors about conflicting declarations (signed vs. unsigned
|
||||
char).
|
||||
|
||||
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
|
||||
---
|
||||
camlibs/ax203/jpeg_memsrcdest.c | 4 ++--
|
||||
camlibs/ax203/jpeg_memsrcdest.h | 4 ++++
|
||||
camlibs/jl2005c/jpeg_memsrcdest.c | 4 ++--
|
||||
camlibs/jl2005c/jpeg_memsrcdest.h | 4 ++++
|
||||
4 files changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/camlibs/ax203/jpeg_memsrcdest.c b/camlibs/ax203/jpeg_memsrcdest.c
|
||||
index 0ed83b1..5614573 100644
|
||||
--- a/camlibs/ax203/jpeg_memsrcdest.c
|
||||
+++ b/camlibs/ax203/jpeg_memsrcdest.c
|
||||
@@ -25,8 +25,8 @@
|
||||
#include "jpeg_memsrcdest.h"
|
||||
|
||||
/* libjpeg8 and later come with their own (API compatible) memory source
|
||||
- and dest */
|
||||
-#if JPEG_LIB_VERSION < 80
|
||||
+ and dest, and older versions may have it backported */
|
||||
+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
|
||||
|
||||
/* Expanded data source object for memory input */
|
||||
|
||||
diff --git a/camlibs/ax203/jpeg_memsrcdest.h b/camlibs/ax203/jpeg_memsrcdest.h
|
||||
index e971182..b13bf3f 100644
|
||||
--- a/camlibs/ax203/jpeg_memsrcdest.h
|
||||
+++ b/camlibs/ax203/jpeg_memsrcdest.h
|
||||
@@ -1,5 +1,7 @@
|
||||
#include <jpeglib.h>
|
||||
|
||||
+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
|
||||
+
|
||||
void
|
||||
jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
|
||||
unsigned long bufsize);
|
||||
@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
|
||||
void
|
||||
jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
|
||||
unsigned long * outsize);
|
||||
+
|
||||
+#endif
|
||||
diff --git a/camlibs/jl2005c/jpeg_memsrcdest.c b/camlibs/jl2005c/jpeg_memsrcdest.c
|
||||
index 321f926..b65310e 100644
|
||||
--- a/camlibs/jl2005c/jpeg_memsrcdest.c
|
||||
+++ b/camlibs/jl2005c/jpeg_memsrcdest.c
|
||||
@@ -25,8 +25,8 @@
|
||||
#include "jpeg_memsrcdest.h"
|
||||
|
||||
/* libjpeg8 and later come with their own (API compatible) memory source
|
||||
- and dest */
|
||||
-#if JPEG_LIB_VERSION < 80
|
||||
+ and dest, and older versions may have it backported */
|
||||
+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
|
||||
|
||||
/* Expanded data source object for memory input */
|
||||
|
||||
diff --git a/camlibs/jl2005c/jpeg_memsrcdest.h b/camlibs/jl2005c/jpeg_memsrcdest.h
|
||||
index e971182..b13bf3f 100644
|
||||
--- a/camlibs/jl2005c/jpeg_memsrcdest.h
|
||||
+++ b/camlibs/jl2005c/jpeg_memsrcdest.h
|
||||
@@ -1,5 +1,7 @@
|
||||
#include <jpeglib.h>
|
||||
|
||||
+#if JPEG_LIB_VERSION < 80 && !defined(MEM_SRCDST_SUPPORTED)
|
||||
+
|
||||
void
|
||||
jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
|
||||
unsigned long bufsize);
|
||||
@@ -7,3 +9,5 @@ jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
|
||||
void
|
||||
jpeg_mem_dest (j_compress_ptr cinfo, unsigned char ** outbuffer,
|
||||
unsigned long * outsize);
|
||||
+
|
||||
+#endif
|
||||
@ -5,17 +5,20 @@ lrwxrwxrwx root/root usr/bin/mupdf -> mupdf-x11-curl
|
||||
-rwxr-xr-x root/root usr/bin/mupdf-gl
|
||||
-rwxr-xr-x root/root usr/bin/mupdf-x11
|
||||
-rwxr-xr-x root/root usr/bin/mupdf-x11-curl
|
||||
-rwxr-xr-x root/root usr/bin/muraster
|
||||
-rwxr-xr-x root/root usr/bin/mutool
|
||||
drwxr-xr-x root/root usr/include/
|
||||
drwxr-xr-x root/root usr/include/mupdf/
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz.h
|
||||
drwxr-xr-x root/root usr/include/mupdf/fitz/
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/annotation.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/archive.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/bidi.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/bitmap.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/buffer.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/colorspace.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/compressed-buffer.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/config.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/context.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/crypt.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/device.h
|
||||
@ -51,12 +54,13 @@ drwxr-xr-x root/root usr/include/mupdf/fitz/
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/structured-text.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/system.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/text.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/track-usage.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/transition.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/tree.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/ucdn.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/unzip.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/util.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/version.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/writer.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/fitz/xml.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/html.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/memento.h
|
||||
@ -72,7 +76,6 @@ drwxr-xr-x root/root usr/include/mupdf/pdf/
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/event.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/field.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/font.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/graft.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/interpret.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/javascript.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/name-table.h
|
||||
@ -83,7 +86,7 @@ drwxr-xr-x root/root usr/include/mupdf/pdf/
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/resource.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/widget.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/pdf/xref.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/xps.h
|
||||
-rwxr-xr-x root/root usr/include/mupdf/svg.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libmupdf.a
|
||||
-rwxr-xr-x root/root usr/lib/libmupdfthird.a
|
||||
|
||||
@ -1 +1 @@
|
||||
658b90788a57d858dcb069cf326e11c3 mupdf-1.9a-source.tar.gz
|
||||
fbe3313cc2e7455aa21cacc64262088b mupdf-1.10-source.tar.gz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: curl freetype libjpeg-turbo xorg-libxext
|
||||
|
||||
name=mupdf
|
||||
version=1.9a
|
||||
version=1.10
|
||||
release=1
|
||||
source=(http://mupdf.com/downloads/$name-$version-source.tar.gz)
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
63ec6b584757eef8cd713e4958297251 qt-everywhere-opensource-src-5.7.0.tar.xz
|
||||
67165bacd3231b57d7b7db1e6bcb7d89 qt5-logo.png
|
||||
9842c327b091b360da7a4d90f5fdf4da qtbase-memory-leak.patch
|
||||
646aea77ca90031c453a65ef61db55f9 qtbug-49452.patch
|
||||
462f079cd46f869def6858903a718bf5 qtbug-53071.patch
|
||||
da4fd787ea877516397a027412e975e1 qtbug-53071b.patch
|
||||
|
||||
@ -6,13 +6,14 @@
|
||||
|
||||
name=qt5
|
||||
version=5.7.0
|
||||
release=3
|
||||
release=4
|
||||
source=(http://download.qt.io/official_releases/qt/${version::3}/$version/single/qt-everywhere-opensource-src-$version.tar.xz
|
||||
qt5-logo.png
|
||||
qtbug-53071.patch
|
||||
qtbug-53071b.patch
|
||||
qtbug-53237.patch
|
||||
qtbug-49452.patch)
|
||||
qtbug-49452.patch
|
||||
qtbase-memory-leak.patch)
|
||||
|
||||
build() {
|
||||
cd qt-everywhere-opensource-src-$version
|
||||
@ -27,6 +28,9 @@ build() {
|
||||
# Fix freetype engine performance
|
||||
patch -p1 -d qtbase -i $SRC/qtbug-49452.patch
|
||||
|
||||
# Fix memory leak
|
||||
patch -p1 -d qtbase -i $SRC/qtbase-memory-leak.patch
|
||||
|
||||
# Respect system CXX
|
||||
[ "$CXX" ] || CXX=g++
|
||||
sed -i "/^QMAKE_CXX\s/s|=.*|= $CXX|" qtbase/mkspecs/common/g++-base.conf
|
||||
|
||||
135
qt5/qtbase-memory-leak.patch
Normal file
135
qt5/qtbase-memory-leak.patch
Normal file
@ -0,0 +1,135 @@
|
||||
From 422838685c31d9b57133a8711bfd5db92095d96d Mon Sep 17 00:00:00 2001
|
||||
From: Robin Burchell <robin.burchell@viroteck.net>
|
||||
Date: Wed, 7 Sep 2016 14:34:03 +0200
|
||||
Subject: [PATCH] xcb: Treat bitmap cursors differently from shaped cursors
|
||||
|
||||
QXcbCursor had a "cache" of cursor handles. Unfortunately, as QXcbCursor has its
|
||||
lifetime tied to the screen, this cache grew unbounded whenever the cursor was
|
||||
set: this could be witnessed worst when repeatedly setting the current cursor to
|
||||
a different pixmap each time.
|
||||
|
||||
We fix this by keeping the cursor cache only for the "regular" shaped cursors
|
||||
that are often shared between windows, working on the assumption that custom
|
||||
cursors are generally specific only to a given window. This makes the lifetime
|
||||
of the bitmap cursors much more clear: they are tied to that window, and when
|
||||
the window is destroyed (or changes cursor), so too is the bitmap cursor
|
||||
destroyed (if set).
|
||||
|
||||
Reported-by: Will Thompson <wjt@endlessm.com>
|
||||
Change-Id: Ia558d858ff49e89cd5220344567203eb0267a133
|
||||
Reviewed-by: Uli Schlachter <psychon@znc.in>
|
||||
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
||||
---
|
||||
src/plugins/platforms/xcb/qxcbcursor.cpp | 24 +++++++++++++++++-------
|
||||
src/plugins/platforms/xcb/qxcbwindow.cpp | 22 +++++++++++++++++++---
|
||||
src/plugins/platforms/xcb/qxcbwindow.h | 3 ++-
|
||||
3 files changed, 38 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
index b321ed9..4646ced 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
|
||||
@@ -353,17 +353,27 @@ void QXcbCursor::changeCursor(QCursor *cursor, QWindow *widget)
|
||||
return;
|
||||
|
||||
xcb_cursor_t c = XCB_CURSOR_NONE;
|
||||
+ bool isBitmapCursor = false;
|
||||
+
|
||||
if (cursor) {
|
||||
- const QXcbCursorCacheKey key(*cursor);
|
||||
- CursorHash::iterator it = m_cursorHash.find(key);
|
||||
- if (it == m_cursorHash.end()) {
|
||||
- const Qt::CursorShape shape = cursor->shape();
|
||||
- it = m_cursorHash.insert(key, shape == Qt::BitmapCursor ? createBitmapCursor(cursor) : createFontCursor(shape));
|
||||
+ const Qt::CursorShape shape = cursor->shape();
|
||||
+ isBitmapCursor = shape == Qt::BitmapCursor;
|
||||
+
|
||||
+ if (!isBitmapCursor) {
|
||||
+ const QXcbCursorCacheKey key(*cursor);
|
||||
+ CursorHash::iterator it = m_cursorHash.find(key);
|
||||
+ if (it == m_cursorHash.end()) {
|
||||
+ it = m_cursorHash.insert(key, createFontCursor(shape));
|
||||
+ }
|
||||
+ c = it.value();
|
||||
+ } else {
|
||||
+ // Do not cache bitmap cursors, as otherwise they have unclear
|
||||
+ // lifetime (we effectively leak xcb_cursor_t).
|
||||
+ c = createBitmapCursor(cursor);
|
||||
}
|
||||
- c = it.value();
|
||||
}
|
||||
|
||||
- w->setCursor(c);
|
||||
+ w->setCursor(c, isBitmapCursor);
|
||||
}
|
||||
|
||||
static int cursorIdForShape(int cshape)
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
index d46228c..5f402b6 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
|
||||
@@ -302,6 +302,7 @@ QXcbWindow::QXcbWindow(QWindow *window)
|
||||
, m_lastWindowStateEvent(-1)
|
||||
, m_syncState(NoSyncNeeded)
|
||||
, m_pendingSyncRequest(0)
|
||||
+ , m_currentBitmapCursor(XCB_CURSOR_NONE)
|
||||
{
|
||||
setConnection(xcbScreen()->connection());
|
||||
}
|
||||
@@ -620,6 +621,9 @@ void QXcbWindow::create()
|
||||
|
||||
QXcbWindow::~QXcbWindow()
|
||||
{
|
||||
+ if (m_currentBitmapCursor != XCB_CURSOR_NONE) {
|
||||
+ xcb_free_cursor(xcb_connection(), m_currentBitmapCursor);
|
||||
+ }
|
||||
if (window()->type() != Qt::ForeignWindow)
|
||||
destroy();
|
||||
else {
|
||||
@@ -2665,10 +2669,22 @@ bool QXcbWindow::setMouseGrabEnabled(bool grab)
|
||||
return result;
|
||||
}
|
||||
|
||||
-void QXcbWindow::setCursor(xcb_cursor_t cursor)
|
||||
+void QXcbWindow::setCursor(xcb_cursor_t cursor, bool isBitmapCursor)
|
||||
{
|
||||
- xcb_change_window_attributes(xcb_connection(), m_window, XCB_CW_CURSOR, &cursor);
|
||||
- xcb_flush(xcb_connection());
|
||||
+ xcb_connection_t *conn = xcb_connection();
|
||||
+
|
||||
+ xcb_change_window_attributes(conn, m_window, XCB_CW_CURSOR, &cursor);
|
||||
+ xcb_flush(conn);
|
||||
+
|
||||
+ if (m_currentBitmapCursor != XCB_CURSOR_NONE) {
|
||||
+ xcb_free_cursor(conn, m_currentBitmapCursor);
|
||||
+ }
|
||||
+
|
||||
+ if (isBitmapCursor) {
|
||||
+ m_currentBitmapCursor = cursor;
|
||||
+ } else {
|
||||
+ m_currentBitmapCursor = XCB_CURSOR_NONE;
|
||||
+ }
|
||||
}
|
||||
|
||||
void QXcbWindow::windowEvent(QEvent *event)
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
index b8bcf44..f2b6904 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
|
||||
@@ -97,7 +97,7 @@ class Q_XCB_EXPORT QXcbWindow : public QXcbObject, public QXcbWindowEventListene
|
||||
bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE;
|
||||
bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE;
|
||||
|
||||
- void setCursor(xcb_cursor_t cursor);
|
||||
+ void setCursor(xcb_cursor_t cursor, bool isBitmapCursor);
|
||||
|
||||
QSurfaceFormat format() const Q_DECL_OVERRIDE;
|
||||
|
||||
@@ -263,6 +263,7 @@ public Q_SLOTS:
|
||||
SyncState m_syncState;
|
||||
|
||||
QXcbSyncWindowRequest *m_pendingSyncRequest;
|
||||
+ xcb_cursor_t m_currentBitmapCursor;
|
||||
};
|
||||
|
||||
QT_END_NAMESPACE
|
||||
@ -1 +1 @@
|
||||
37bae2bf9cf6deda3b7d8b0ad61fc0af ruby-2.3.2.tar.xz
|
||||
0cba3d1b677d2695236ace62ca6d2255 ruby-2.3.3.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: ruby
|
||||
|
||||
name=ruby-doc
|
||||
version=2.3.2
|
||||
version=2.3.3
|
||||
release=1
|
||||
source=(https://cache.ruby-lang.org/pub/ruby/${version%.*}/ruby-$version.tar.xz)
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
37bae2bf9cf6deda3b7d8b0ad61fc0af ruby-2.3.2.tar.xz
|
||||
0cba3d1b677d2695236ace62ca6d2255 ruby-2.3.3.tar.xz
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
# Depends on: gdbm libgmp openssl readline zlib libffi libyaml
|
||||
|
||||
name=ruby
|
||||
version=2.3.2
|
||||
version=2.3.3
|
||||
release=1
|
||||
source=(http://cache.ruby-lang.org/pub/$name/${version%.*}/$name-$version.tar.xz)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user