diff --git a/talimatname/genel/gvfs/talimat b/talimatname/genel/gvfs/talimat index 6f9b4a7cb..d747a36fb 100644 --- a/talimatname/genel/gvfs/talimat +++ b/talimatname/genel/gvfs/talimat @@ -1,18 +1,24 @@ # Description: Userspace virtual filesystem implemented as a pluggable module for gio # URL: http://www.gnome.org/ -# Packager: tyrry at nutyx dot org -# Depends on: avahi dbus-glib intltool libsecret gtk3 libsoup udisks2 obexd fuse libarchive samba bluez +# Packager: milisarge +# Depends on: avahi dbus-glib intltool libsecret gtk3 libsoup udisks2 obexd fuse libarchive samba bluez gcr libgphoto2 name=gvfs -version=1.24.2 +version=1.28.2 release=1 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz) build() { cd $name-$version -./configure --prefix=/usr \ ---sysconfdir=/etc \ ---disable-gphoto2 +./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/usr/share/bash-completion/completions \ + --disable-systemd make make DESTDIR=$PKG install +rm -rf $PKG/usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,mtp,google} +rm -rf $PKG/usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,mtp,google}.mount +rm -rf $PKG/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml +rm -rf $PKG/usr/share/GConf/gsettings/gvfs-smb.convert } diff --git a/talimatname/genel/libgphoto2/jpeg.patch b/talimatname/genel/libgphoto2/jpeg.patch new file mode 100644 index 000000000..34baeadd6 --- /dev/null +++ b/talimatname/genel/libgphoto2/jpeg.patch @@ -0,0 +1,92 @@ +From 0df14db3eda1b780a27b1c54bc8f251d15afebbc Mon Sep 17 00:00:00 2001 +From: Patrick Ohly +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 +--- + 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 + ++#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 + ++#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/talimatname/genel/libgphoto2/talimat b/talimatname/genel/libgphoto2/talimat index a14e80ea1..415edafa0 100644 --- a/talimatname/genel/libgphoto2/talimat +++ b/talimatname/genel/libgphoto2/talimat @@ -1,16 +1,18 @@ # Description: Core library of gphoto2, designed to allow access to digital camera by external programs. # URL: http://www.gphoto.org/proj/libgphoto2/ -# Packager: pierre at nutyx dot org +# Packager: milisarge # Depends on: libjpeg-turbo libexif libusb-compat name=libgphoto2 -version=2.5.8 +version=2.5.10 release=1 -source=(http://downloads.sourceforge.net/gphoto/$name-$version.tar.bz2) +source=(https://distfiles.macports.org/libgphoto2/libgphoto2-2.5.10.tar.bz2 + jpeg.patch) build() { cd $name-$version + patch -Np1 -i ../jpeg.patch ./configure --prefix=/usr --sysconfdir=/etc make make DESTDIR=$PKG install