[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc0-4-g844154a

9 May 2013

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  844154a505d8a3b7dc68fdd8d7294bb202178d5f (commit)
       via  38ba95e6006053cac3c57afd7f76e4ffa6ac184b (commit)
       via  6742058090751f838d9adf757d5e5a3e1e722345 (commit)
       via  ac86a572b0244636fbf7f2748a72059ae1b3b1eb (commit)
      from  834cc1ebc413ddcae710eda665917661f2c7e71e (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/844154a505d8a3b7dc68fdd8d7294bb202178...

commit 844154a505d8a3b7dc68fdd8d7294bb202178d5f
Author: Cyril Hrubis <metan@ucw.cz>
Date:   Thu May 9 10:39:31 2013 +0200

    build: Update list of exported syms.
    
    After input drivers were moved to backends
    the symbols needs to be moved too.
    
    Signed-off-by: Cyril Hrubis <metan@ucw.cz>

diff --git a/build/syms/Backend_symbols.txt b/build/syms/Backend_symbols.txt
index 322c627..74e2967 100644
--- a/build/syms/Backend_symbols.txt
+++ b/build/syms/Backend_symbols.txt
@@ -19,3 +19,6 @@ GP_BackendFlip
 GP_BackendWaitEvent
 GP_BackendPollEvent
 
+GP_InputDriverX11EventPut
+GP_InputDriverX11Init
+GP_InputDriverSDLEventPut
diff --git a/build/syms/Input_symbols.txt b/build/syms/Input_symbols.txt
index 0368dc2..de44378 100644
--- a/build/syms/Input_symbols.txt
+++ b/build/syms/Input_symbols.txt
@@ -2,10 +2,7 @@ GP_EventKeyName
 GP_EventDump
 
 GP_InputDriverLinuxRead
-GP_InputDriverSDLEventPut
 GP_InputDriverLinuxOpen
-GP_InputDriverX11EventPut
-GP_InputDriverX11Init
 GP_InputDriverLinuxClose
 GP_InputDriverKBDEventPut
 

http://repo.or.cz/w/gfxprim.git/commit/38ba95e6006053cac3c57afd7f76e4ffa6ac1...

commit 38ba95e6006053cac3c57afd7f76e4ffa6ac184b
Author: Cyril Hrubis <metan@ucw.cz>
Date:   Wed May 8 23:35:28 2013 +0200

    install: Fix symlink creation.
    
    Signed-off-by: Cyril Hrubis <metan@ucw.cz>

diff --git a/install.sh b/install.sh
index 0213ab8..0b3020a 100755
--- a/install.sh
+++ b/install.sh
@@ -30,7 +30,7 @@ for i in build/*.so build/*.so.* build/*.a; do
 	if [ -L "$i" ]; then
 	        TARGET=`basename "$i"`
 		SOURCE=`readlink "$i"`
-		(cd "$LIB_LOC" && rm -f "$TARGET" && ln -s "$LIB_LOC$SOURCE" "$TARGET")
+		(cd "$LIB_LOC" && rm -f "$TARGET" && ln -s "$SOURCE" "$TARGET")
 	else
 		install "$i" "$LIB_LOC"
 	fi

http://repo.or.cz/w/gfxprim.git/commit/6742058090751f838d9adf757d5e5a3e1e722...

commit 6742058090751f838d9adf757d5e5a3e1e722345
Author: Cyril Hrubis <metan@ucw.cz>
Date:   Wed May 8 22:29:50 2013 +0200

    loaders: gif: Fix build with giflib > 5.0.0
    
    Signed-off-by: Cyril Hrubis <metan@ucw.cz>

diff --git a/libs/loaders/GP_GIF.c b/libs/loaders/GP_GIF.c
index 8eba747..b8554e8 100644
--- a/libs/loaders/GP_GIF.c
+++ b/libs/loaders/GP_GIF.c
@@ -67,7 +67,11 @@ int GP_OpenGIF(const char *src_path, void **f)
 
 	errno = 0;
 
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+	gf = DGifOpenFileName(src_path, NULL);
+#else
 	gf = DGifOpenFileName(src_path);
+#endif
 
 	if (gf == NULL) {
 		/*
@@ -138,6 +142,16 @@ static const char *gif_err_name(int err)
 	}
 }
 
+static int gif_err(GifFileType *gf)
+{
+#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
+	return gf->Error;
+#else
+	(void) gf;
+	return GifLastError();
+#endif
+}
+
 static int read_extensions(GifFileType *gf)
 {
 	uint8_t *gif_ext_ptr;
@@ -147,7 +161,7 @@ static int read_extensions(GifFileType *gf)
 
 	if (DGifGetExtension(gf, &gif_ext_type, &gif_ext_ptr) != GIF_OK) {
 		GP_DEBUG(1, "DGifGetExtension() error %s (%i)",
-		         gif_err_name(GifLastError()), GifLastError());
+		         gif_err_name(gif_err(gf)), gif_err(gf));
 		return EIO;
 	}
 
@@ -156,7 +170,7 @@ static int read_extensions(GifFileType *gf)
 	do {
 		if (DGifGetExtensionNext(gf, &gif_ext_ptr) != GIF_OK) {
 			GP_DEBUG(1, "DGifGetExtension() error %s (%i)",
-			         gif_err_name(GifLastError()), GifLastError());
+			         gif_err_name(gif_err(gf)), gif_err(gf));
 			return EIO;
 		}
 
@@ -254,7 +268,7 @@ GP_Context *GP_ReadGIF(void *f, GP_ProgressCallback *callback)
 		if (DGifGetRecordType(gf, &rec_type) != GIF_OK) {
 			//TODO: error handling
 			GP_DEBUG(1, "DGifGetRecordType() error %s (%i)",
-			         gif_err_name(GifLastError()), GifLastError()); 
+			         gif_err_name(gif_err(gf)), gif_err(gf));
 			err = EIO;
 			goto err1;
 		}
@@ -276,7 +290,7 @@ GP_Context *GP_ReadGIF(void *f, GP_ProgressCallback *callback)
 		if (DGifGetImageDesc(gf) != GIF_OK) {
 			//TODO: error handling
 			GP_DEBUG(1, "DGifGetImageDesc() error %s (%i)",
-			         gif_err_name(GifLastError()), GifLastError()); 
+			         gif_err_name(gif_err(gf)), gif_err(gf)); 
 			err = EIO;
 			goto err1;
 		}

http://repo.or.cz/w/gfxprim.git/commit/ac86a572b0244636fbf7f2748a72059ae1b3b...

commit ac86a572b0244636fbf7f2748a72059ae1b3b1eb
Author: Cyril Hrubis <metan@ucw.cz>
Date:   Wed May 8 18:27:55 2013 +0200

    install: Add bindir, libdir and includedir configure opts.
    
    Signed-off-by: Cyril Hrubis <metan@ucw.cz>

diff --git a/Makefile b/Makefile
index bfd39a6..1ffbe41 100644
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,9 @@ LIB_LOC=/usr/lib/
 
 install:
 ifdef VERBOSE
-	./install.sh ""
+	./install.sh $(prefix) $(libdir) $(bindir) $(includedir)
 else
-	@./install.sh ""
+	@./install.sh $(prefix) $(libdir) $(bindir) $(includedir)
 endif
 
 tar:
diff --git a/configure b/configure
index 894664f..df8a74f 100755
--- a/configure
+++ b/configure
@@ -209,7 +209,17 @@ def basic_checks(cfg):
     
     cfg['PYTHON_VER'][0] = python_version(cfg) 
 
-    sys.stderr.write("n")
+    if cfg['libdir'][0] == '':
+        sys.stderr.write("Checking for lib directory ... ")
+
+        if os.path.isdir(cfg['prefix'][0] + '/usr/lib64'):
+            cfg['libdir'][0] = '/usr/lib64'
+        else:
+            cfg['libdir'][0] = '/usr/lib'
+
+        sys.stderr.write(cfg['libdir'][0] + 'n');
+
+    sys.stderr.write('n')
 
 #
 # Write configuration files
@@ -284,7 +294,10 @@ if __name__ ==  '__main__':
            'PYTHON_CONFIG' : ['python-config', 'Python config helper'],
            'PYTHON_VER'    : ['', 'Python version (derived from python config)'],
 	   'include_path'  : ['/usr/include', 'Path to the system headers'],
-	   'prefix'        : ['/usr', 'Installation prefix']}
+	   'prefix'        : ['', 'Installation prefix'],
+	   'bindir'        : ['/usr/bin', 'Where to install binaries'],
+	   'libdir'        : ['', 'Where to install libraries'],
+	   'includedir'    : ['/usr/include', 'Where to install headers']}
 
     #
     # Library detection/enable disable
diff --git a/install.sh b/install.sh
index fef3703..0213ab8 100755
--- a/install.sh
+++ b/install.sh
@@ -1,30 +1,24 @@
 #!/bin/sh
 
-INSTALL_PREFIX="$1"
+PREFIX="$1"
+LIBDIR="$2"
+BINDIR="$3"
+INCLUDEDIR="$4"
 
-if test -z "$INSTALL_PREFIX"; then
-	INSTALL_PREFIX="/usr"
-fi
-
-HEADER_LOC="$INSTALL_PREFIX/include/"
-if [ -d $INSTALL_PREFIX/lib64 ]; then
-	LIB_LOC="$INSTALL_PREFIX/lib64/"
-else
-	LIB_LOC="$INSTALL_PREFIX/lib/"
-fi
-
-BIN_LOC="$INSTALL_PREFIX/bin/"
+HEADER_LOC="$PREFIX/$INCLUDEDIR"
+LIB_LOC="$PREFIX/$LIBDIR"
+BIN_LOC="$PREFIX/$BINDIR"
 
 # Headers
 echo "INSTALL headers ($HEADER_LOC)"
-install -m 775 -d "${HEADER_LOC}GP"
+install -m 775 -d "${HEADER_LOC}/GP"
 for i in `ls include/`; do
 	if [ -d "include/$i" ]; then
 		echo " $i"
-		install -m 775 -d "${HEADER_LOC}GP/$i"
-		install -m 664 "include/$i/"*.h "${HEADER_LOC}GP/$i"
+		install -m 775 -d "${HEADER_LOC}/GP/$i"
+		install -m 664 "include/$i/"*.h "${HEADER_LOC}/GP/$i"
 	else
-		install -m 664 "include/$i" "${HEADER_LOC}GP/$i"
+		install -m 664 "include/$i" "${HEADER_LOC}/GP/$i"
 	fi
 done
 
@@ -44,5 +38,6 @@ done
 
 # Binaries
 echo "INSTALL binaries"
+install -m 775 -d "$BIN_LOC"
 install -m 755 gfxprim-config "$BIN_LOC"
 install -m 755 demos/spiv/spiv "$BIN_LOC"
diff --git a/pyinst.mk b/pyinst.mk
index 38d08ef..f1323b6 100644
--- a/pyinst.mk
+++ b/pyinst.mk
@@ -6,13 +6,7 @@
 ifdef SWIG
 ifdef PYTHON_CONFIG
 
-# Detect /usr/lib64 vs /usr/lib
-LIBDIR=$(findstring lib64,$(wildcard $(prefix)/*))
-ifeq ($(LIBDIR),)
-LIBDIR=lib
-endif
-
-PY_INSTALL_PREFIX=$(prefix)/$(LIBDIR)/python$(PYTHON_VER)/gfxprim/$(LIBNAME)
+PY_INSTALL_PREFIX=$(prefix)/$(libdir)/python$(PYTHON_VER)/gfxprim/$(LIBNAME)
 
 ifdef DESTDIR
 PY_INSTALL_PREFIX:=$(DESTDIR)$(PY_INSTALL_PREFIX)

-----------------------------------------------------------------------

Summary of changes:
 Makefile                       |    4 ++--
 build/syms/Backend_symbols.txt |    3 +++
 build/syms/Input_symbols.txt   |    3 ---
 configure                      |   17 +++++++++++++++--
 install.sh                     |   31 +++++++++++++------------------
 libs/loaders/GP_GIF.c          |   22 ++++++++++++++++++----
 pyinst.mk                      |    8 +-------
 7 files changed, 52 insertions(+), 36 deletions(-)


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.
-- 
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

    

metan

tags

participants (1)