diff --git a/common/shlibs b/common/shlibs index 6a85f47225c..221fb0e69fe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -779,8 +779,8 @@ libv4l1.so.0 v4l-utils v4l-utils-devel libclutter-gst-1.0.so.0 clutter-gst clutter-gst-devel libmx-1.0.so.2 mx mx-devel libmx-gtk-1.0.so.0 mx mx-devel -libcheese.so.1 libcheese cheese-devel -libcheese-gtk.so.20 libcheese cheese-devel +libcheese.so.3 libcheese cheese-devel +libcheese-gtk.so.21 libcheese cheese-devel libjson.so.0 json-c json-c-devel libcogl.so.5 cogl cogl-devel libcogl-pango.so.0 cogl cogl-devel diff --git a/srcpkgs/cheese/cheese-devel.template b/srcpkgs/cheese/cheese-devel.template index 0defda2f915..2a270aba561 100644 --- a/srcpkgs/cheese/cheese-devel.template +++ b/srcpkgs/cheese/cheese-devel.template @@ -1,16 +1,18 @@ # Template file for 'cheese-devel'. # -short_desc="${sourcepkg} (development files)" +short_desc="${sourcepkg} -- development files" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." Add_dependency run gst-plugins-base-devel Add_dependency run libcanberra-devel -Add_dependency run libcheese +Add_dependency run clutter-gst-devel +Add_dependency run libcheese ">=${version}" -do_install() -{ +noarch=yes + +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/gir-1.0 usr/share diff --git a/srcpkgs/cheese/cheese.rshlibs b/srcpkgs/cheese/cheese.rshlibs index 3329e79fcb7..794c8aa7799 100644 --- a/srcpkgs/cheese/cheese.rshlibs +++ b/srcpkgs/cheese/cheese.rshlibs @@ -1,5 +1,3 @@ -libcheese.so.1 -libcheese-gtk.so.20 libgstreamer-0.10.so.0 libgnome-desktop-3.so.2 libclutter-gtk-1.0.so.0 @@ -15,3 +13,5 @@ libgthread-2.0.so.0 libglib-2.0.so.0 libpthread.so.0 libc.so.6 +libcheese.so.3 +libcheese-gtk.so.21 diff --git a/srcpkgs/cheese/depends b/srcpkgs/cheese/depends index dd8a09fd511..88592da7496 100644 --- a/srcpkgs/cheese/depends +++ b/srcpkgs/cheese/depends @@ -1,3 +1,2 @@ -abi_depends=">=3.0.2" -# libcheese appeared in 3.2.1 -api_depends=">=3.2.1" +abi_depends=">=3.3.92" +api_depends="${abi_depends}" diff --git a/srcpkgs/cheese/libcheese.template b/srcpkgs/cheese/libcheese.template index 26bdfd4e999..dd8b4ff71a0 100644 --- a/srcpkgs/cheese/libcheese.template +++ b/srcpkgs/cheese/libcheese.template @@ -5,11 +5,9 @@ long_desc="${long_desc} This package contains the shared libraries." -revision=1 replaces="cheese<=3.2.2" # for the typelib file -do_install() -{ +do_install() { vmove "usr/lib/*.so*" usr/lib vmove usr/lib/girepository-1.0 usr/lib } diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 8959337b8d0..86b1c0329f2 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,16 +1,14 @@ # Template file for 'cheese' pkgname=cheese -version=3.2.2 -revision=1 -distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz" +version=3.3.92 +distfiles="${GNOME_SITE}/$pkgname/3.3/$pkgname-$version.tar.xz" build_style=gnu-configure -configure_args="--disable-scrollkeeper ---disable-static --disable-schemas-compile" +configure_args="--disable-scrollkeeper --disable-static --disable-schemas-compile" short_desc="GNOME tool to take pictures and videos from your webcam" maintainer="Juan RP " homepage="http://www.gnome.org/projects/cheese/" license="GPL-2" -checksum=8f050b03365310d739c54e48c8c62f8e2d6d9a028fed3eb3c8da4c7654a9009a +checksum=93fdeabd969a07aabc39c4aa91bc25a67f6e8b7e95c4801cccdb36af356385da long_desc=" A webcam application that supports image and video capture. Makes it easy to take photos and videos of you, your friends, pets or whatever you want. Allows @@ -20,15 +18,14 @@ long_desc=" gtk_iconcache_dirs="/usr/share/icons/hicolor" subpackages="lib${pkgname} ${pkgname}-devel" -Add_dependency run gst-plugins-good -Add_dependency run gst-plugins-bad +Add_dependency run nautilus-sendto Add_dependency run desktop-file-utils Add_dependency run hicolor-icon-theme -Add_dependency run gsettings-desktop-schemas Add_dependency build pkg-config Add_dependency build intltool Add_dependency build gnome-doc-utils +Add_dependency build itstool Add_dependency build gobject-introspection Add_dependency build gst-plugins-base-devel Add_dependency build clutter-gtk-devel @@ -39,4 +36,7 @@ Add_dependency build libcanberra-devel Add_dependency build librsvg-devel Add_dependency build gnome-desktop-devel +Add_dependency full gst-plugins-good +Add_dependency full gst-plugins-bad Add_dependency full gnome-video-effects +Add_dependency full gsettings-desktop-schemas