← Back to branch summary

~ubuntu-branches/ubuntu/vivid/clutter-1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to clutter/cally/cally-texture.h

  • Committer: Package Import Robot
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2014-03-26 11:51:28 UTC
  • mfrom: (1.5.1) (4.1.30 experimental)
  • Revision ID: package-import@ubuntu.com-20140326115128-timmbsde8734o6wz
Tags: 1.18.0-1
* New upstream release.
* debian/control.in:
  + Bump gtk-doc-tools build dependency.
  + Also break libcogl15.
  + Standards-Version is 3.9.5, no changes needed.
* debian/libclutter-1.0-0.symbols:
  + Drop a few symbols that were accidentally exported in the DSO because
    they had a clutter_ prefix but were not in the public headers.
  + Add one new symbol.
  + Drop unnecessary debian revisions from some symbols.
* debian/control.in,
  debian/rules,
  debian/libclutter-1.0-0.symbols:
  + Temporarily disable evdev input support. It was only enabled in 1.17.6-1
    in experimental and there is nothing using it yet, and I would like to
    wait a bit before uploading libinput to unstable as the ABI isn't stable
    yet.
* d/p/0001-wayland-Add-missing-CLUTTER_AVAILABLE-annotations.patch:
  + Add missing annotations so that a few symbols are exported in the DSO.

* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clutter/cally/cally-texture.h
18
18
 * License along with this library. If not, see <http://www.gnu.org/licenses/>.
19
19
 */
20
20
 
 
21
#ifndef __CALLY_TEXTURE_H__
 
22
#define __CALLY_TEXTURE_H__
 
23
 
21
24
#if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
22
25
#error "Only <cally/cally.h> can be included directly."
23
26
#endif
24
27
 
25
 
#ifndef __CALLY_TEXTURE_H__
26
 
#define __CALLY_TEXTURE_H__
27
 
 
 
28
#include <clutter/clutter.h>
28
29
#include <cally/cally-actor.h>
29
 
#include <clutter/clutter.h>
30
30
 
31
31
G_BEGIN_DECLS
32
32
 
74
74
  gpointer _padding_dummy[8];
75
75
};
76
76
 
 
77
CLUTTER_AVAILABLE_IN_1_4
77
78
GType      cally_texture_get_type (void) G_GNUC_CONST;
 
79
CLUTTER_AVAILABLE_IN_1_4
78
80
AtkObject *cally_texture_new      (ClutterActor *actor);
79
81
 
80
82
G_END_DECLS