This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git.
The branch, master has been updated via 09bc0dca7b0d23abbeb091baea61573a9cc0411d (commit) via b82cb9ba7c65053b1fe49968096db5db8a808b48 (commit) from 85eda14c378b6a2acce26d19fa7073ac509ee386 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/09bc0dca7b0d23abbeb091baea61573a9cc04...
commit 09bc0dca7b0d23abbeb091baea61573a9cc0411d Author: Cyril Hrubis metan@ucw.cz Date: Sun Mar 31 15:42:42 2013 +0200
grabbers: v4l2: Fix segfault on unsupported protocol.
Signed-off-by: Cyril Hrubis metan@ucw.cz
diff --git a/libs/grabbers/GP_V4L2.c b/libs/grabbers/GP_V4L2.c index 4a00e51..fc97e9b 100644 --- a/libs/grabbers/GP_V4L2.c +++ b/libs/grabbers/GP_V4L2.c @@ -298,9 +298,11 @@ struct GP_Grabber *GP_GrabberV4L2Init(const char *device, if (ioctl(fd, VIDIOC_S_CROP, &crop)) { /* error/cropping not supported */ } - } else { - /* errors ignored? */ + GP_WARN("ioctl VIDIOC_CROPCAP failed: %s", + strerror(errno)); + err = errno; + goto err0; }
struct v4l2_format fmt;
http://repo.or.cz/w/gfxprim.git/commit/b82cb9ba7c65053b1fe49968096db5db8a808...
commit b82cb9ba7c65053b1fe49968096db5db8a808b48 Author: Cyril Hrubis metan@ucw.cz Date: Fri Mar 29 14:49:21 2013 +0100
doc: Add compilation how to.
diff --git a/doc/Makefile b/doc/Makefile index 840ea66..3e17452 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ SOURCES=general.txt context.txt loaders.txt filters.txt basic_types.txt environment_variables.txt debug.txt core.txt api.txt input.txt gen.txt pixels.txt coordinate_system.txt coding_style.txt get_put_pixel.txt blits.txt progress_callback.txt text_api.txt - event_queue.txt + event_queue.txt compilation.txt
SOURCES+=core_python.txt gfx_python.txt loaders_python.txt
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf index af20f91..9c351e6 100644 --- a/doc/asciidoc.conf +++ b/doc/asciidoc.conf @@ -42,8 +42,7 @@ endif::disable-javascript[] <h4>Navigation</h4> <ul> <li><a href="general.html">Home</a></li> - <li><a href="api.html">API</a></li> - <li><a href="examples.html">Examples</a></li> + <li><a href="compilation.html">Compilation</a></li> </ul>
<h4>API Pages</h4> diff --git a/doc/asciidoc.css b/doc/asciidoc.css index c663f2d..37a9d07 100644 --- a/doc/asciidoc.css +++ b/doc/asciidoc.css @@ -118,9 +118,9 @@ pre { div.left-menu { position: relative; top: 90pt; - left: -100pt; + left: -110pt; height: 0; - width: 100pt; + width: 110pt; }
div.logo h1 { diff --git a/doc/compilation.txt b/doc/compilation.txt new file mode 100644 index 0000000..741b878 --- /dev/null +++ b/doc/compilation.txt @@ -0,0 +1,102 @@ +Compilation +----------- + +GFXprim needs following tools to compile: +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +* C compiler (tested with 'gcc' or 'clang') +* GNU make +* Python (2.6 or newer) +* Jinja2 + +Additional dependencies: +~~~~~~~~~~~~~~~~~~~~~~~~ + +Image loaders +^^^^^^^^^^^^^ + +* libjpeg +* libpng +* giflib + +Text rendering +^^^^^^^^^^^^^^ + +* FreeType + +Backends +^^^^^^^^ + +* X11 +* SDL (not recomended, SDL is known to be slow and buggy) + +Python Bindings +^^^^^^^^^^^^^^^ + +* Swig + +Compilation +~~~~~~~~~~~ + +Once devel packages are installed the compilation is as simple as running +'configure' and 'make'. + +NOTE: The 'configure' script is written in 'Python'. + +.Compilation +------------------------------------------------------------------------------- +gfxprim # ./configure +... + +gfxprim # make +------------------------------------------------------------------------------- + +TIP: GFXprim supports proper parallel build, you most likely want to add + the '-j' with number of your processors + 1 as a parameter to the 'make'. + + +.Installation +------------------------------------------------------------------------------- +gfxprim # make install +------------------------------------------------------------------------------- + +The 'make install' command will install GFXprim libraries and devel headers +into your system. Python bindings are not installable at the moment. + +OpenSUSE +~~~~~~~~ + +Here are commands to install required packages on +link:http://www.opensuse.org/%5BOpenSUSE]. + +.Install basic tools +------------------------------------------------------------------------------- +zypper in gcc make python-Jinja2 +------------------------------------------------------------------------------- + +.Install jpeg and png devel libraries +------------------------------------------------------------------------------- +zypper in libjpeg-devel libpng-devel giflib-devel +------------------------------------------------------------------------------- + +.Install FreeType devel library +------------------------------------------------------------------------------- +zypper in freetype-devel +------------------------------------------------------------------------------- + +.Install X11 devel library +------------------------------------------------------------------------------- +zypper in libX11-devel libXext-devel +------------------------------------------------------------------------------- + +.Install swig +------------------------------------------------------------------------------- +zypper in swig python-devel +------------------------------------------------------------------------------- + +.All in the one for the lazy +------------------------------------------------------------------------------- +zypper in gcc make python-Jinja2 libjpeg-devel libpng-devel giflib-devel + freetype-devel libX11-devel libXext-devel swig python-devel +------------------------------------------------------------------------------- +
-----------------------------------------------------------------------
Summary of changes: doc/Makefile | 2 +- doc/asciidoc.conf | 3 +- doc/asciidoc.css | 4 +- doc/compilation.txt | 102 +++++++++++++++++++++++++++++++++++++++++++++++ libs/grabbers/GP_V4L2.c | 6 ++- 5 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 doc/compilation.txt
repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.