1
0
Fork 0
Commit graph

23 commits

Author SHA1 Message Date
Jasper St. Pierre
d749a28cb0 Update .gitignore 2013-08-21 15:33:21 -04:00
Jasper St. Pierre
4ef5a5fc08 Update .gitignore 2013-08-20 19:14:57 -04:00
Neil Roberts
5f86563c86 cogl-gst: Add some documentation
Adds documentation comments to CoglGstVideoSink and makes it generate
a separate manual to contain it.

One thing that I wasn't able to figure out with this was how to get
the documentation to have correct references to the main Cogl docs.
You can pass arguments to gtkdoc-fixxref to point to other manuals,
but presumably this needs the installed locations and when the
Cogl-Gst documentation is generated the Cogl docs may not have been
installed yet.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 5acdf8db47311893a9cf9ea04a66a287b657b8b0)
2013-06-21 19:04:52 +01:00
Plamena Manolova
1eca1631a7 Include CoglGst
CoglGst is a GStreamer integration library that facilitates
video playback using the Cogl API. It works by retrieving
each video frame from the GStreamer pipeline and attaching
it to a Cogl pipeline in the form of a Cogl texture along
with possible color model conversion shaders. The pipeline
is then retrieved by the user during each draw. An example
use of the CoglGst API is included in the examples directory.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit dfb94cf4b0b6b42d6465df362a0c0af780596890)
2013-06-21 18:57:24 +01:00
Emanuele Aina
2ce952af59 gitignore: Ignore the examples/cogl-gles2-gears executable
https://bugzilla.gnome.org/show_bug.cgi?id=697330

Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit e3cc008e7a26af462871448561e4cde0f95bfdf9)
2013-04-23 18:30:54 +01:00
Emanuele Aina
b8673fbb2f build: Use LT_LIB_M to find the math library in a portable way
https://bugzilla.gnome.org/show_bug.cgi?id=697330

Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit a7b4930e14add7d955c22f396178b71083dfb52f)

Conflicts:
	cogl/Makefile.am
2013-04-23 18:30:50 +01:00
Damien Lespiau
d2c41502a4 build: Allow to build cogl without an external glib dependency
This commit pushes --disable-glib to the extreme of embedding the par of
glib cogl depends on in tree to be able to generate a DSO that does not
depend on an external glib.

To do so, it:
  - keeps a lot of glib's configure.ac in as-glibconfig.m4
  - pulls the code cogl depends on and the necessary dependencies

Reviewed-by: Robert Bragg <robert@linux.intel.com>
2013-01-22 17:47:58 +00:00
Damien Lespiau
5ef579b593 gitignore: Only ignore the README file at the root of the repository
We should be able to modify/add README files else where in the tree and
see them with git status, eg build/mingw/README.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit e97a1bb33a10dc4ea8a23a30cd5e78391439c84f)
2013-01-18 17:28:25 +00:00
Damien Lespiau
f4bb93df7f gitignore: Ignore the new and generated cogl-egl-defines.h
Reviewed-by: Neil Roberts <neil@linux.intel.com>
(cherry picked from commit cf9498b186edf6179c678e92faddcacff11f88f2)
2013-01-18 17:28:25 +00:00
Damien Lespiau
e58b21017e Update .gitignore
The usual suspects (more examples ans tests, generated headers) and the
documentation updated to the cogl2 name.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 90b07230692d3fb36ea18c651ae120e472b5380e)
2012-08-06 14:27:44 +01:00
Neil Roberts
7f287dda85 Update .gitignore
Reviewed-by: Robert Bragg <robert@linux.intel.com>
2012-03-20 13:23:47 +00:00
Jasper St. Pierre
513c159106 Update .gitignore
Reviewed-by: Neil Roberts <neil@linux.intel.com>
2012-02-14 20:42:12 +00:00
Chun-wei Fan
2055f6ba91 VS 2008/2010 project files to build Cogl
These are the VS 2008/2010 project files to build Cogl, with a README.txt
to explain the process involved.

Note that the Cogl and Cogl-Pango projects (and filters for VS2010) are
expanded with the correct source file listings during "make dist", which
is done to simplify maintenance of these project files.

-added preconfigured config.h(.win32.in), which is expanded with the
 correct versioining info during autogen
-added preconfigued cogl/cogl-defines.h.win32
-added symbols files for cogl and cogl-pango
-Have configure.ac expand the config.h.win32.in into config.h.win32
 with the correct versioning info, etc, and to include the Visual C++
 project files for distribution
-Added rules in cogl/Makefile.am to expand the cogl VS 2008/2010 projects
 and filters from the templates with up-to-date source file listings, to
 distribute cogl-enum-types.c, cogl-enum-types.h to ease compilation and
 to avoid depending on PERL on Windows installations.
-Added rules in cogl-pango/Makefile.am to expand the cogl-pango VS2008/
 2010 projects and filters from the templates with up-to-date source file
 listings.
-Added/edited various Makefile.am's in build to distribute the VS2008/2010
 project files and associated items required for the build.
-Update .gitignore. There needs to be a pre-configured
 config.h(.win32) and its template, config.h.win32.in for Visual C++
 builds

https://bugzilla.gnome.org/show_bug.cgi?id=650020

Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-11-25 13:12:45 +00:00
Damien Lespiau
ee01fd263a egl-gdl: Don't generate cogl-display.h
It's not necessary to generate cogl-display.h just for the GDL backend
and to change the inclusion of libgdl.h. We can just tweak the include
CFLAGS to put /usr/include/CE4100 in the search path when needed.

Previously this did not work because of a stay ',' at the end of the
COGL_EXTRA_CFLAGS int he configure.ac. This actually simplifies the
code, which is always good.

This also fixes out of tree builds.

https://bugzilla.gnome.org/show_bug.cgi?id=655724

Reviewed-by: Neil Roberts <neil@linux.intel.com>
2011-08-01 16:36:52 +01:00
Damien Lespiau
fe4a918d4a gitignore: Ignore examples/x11-ftp 2011-07-29 12:04:36 +01:00
Damien Lespiau
a53af153c3 egl-gdl: Correctly substitute COGL_CEX100_LIBGDL_PREFIX
We weren't defining CLUTTER_CEX100_LIBGDL_PREFIX in the configure.ac and
thus failing to compile when selecting the EGL/GDL winsys. Take the
opportunity to rename that to COGL_CEX100_LIBGDL_PREFIX

https://bugzilla.gnome.org/show_bug.cgi?id=655355
2011-07-29 11:50:15 +01:00
Robert Bragg
fcb8de2cde dist: Don't use elaborate script to gen Changelogs
The changelog generation scripts used for releases are overly elaborate
and fragile. A Changelog is also no substitute for the Git log so now we
simply ship a static Changelog that points to the Git log instead.
2011-07-20 16:58:46 +01:00
Emmanuele Bassi
ee4adeff4a Add some generated files to the gitignore list 2011-07-13 14:41:59 +01:00
Robert Bragg
c6b0efb42d Adds examples/crate to .gitignore 2011-07-11 15:40:01 +01:00
Robert Bragg
3729bf2769 Make it clearer that the 2.0 API is experimental
This explicitly renames the cogl-2.0 reference manual to
cogl-2.0-experimental and renames the cogl-2.0 pkg-config file to
cogl-2.0-experimental.pc. Hopefully this should avoid
miss-understandings.
2011-06-14 17:09:55 +01:00
Damien Lespiau
5ad1869a3d gitignore: Ignore *.exe files 2011-05-12 11:45:33 +01:00
Damien Lespiau
f02ec9fc46 gitignore: Update .gitignore to make git status silent again 2011-05-06 16:23:13 +01:00
Robert Bragg
bf4c64e190 Adds an initial .gitignore
This adds a .gitignore file to the top of the repo
2011-05-06 12:12:13 +01:00