From: Enlightenment C. <no...@cv...> - 2007-03-11 03:10:45
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_main.c Log Message: Set these lists to null first as well. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ephoto_main.c 11 Mar 2007 01:14:47 -0000 1.9 +++ ephoto_main.c 11 Mar 2007 09:10:42 -0000 1.10 @@ -55,6 +55,8 @@ em = NULL; em = calloc(1, sizeof(Ephoto_Main)); + em->albums = NULL; + em->images = NULL; em->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(em->win), "Ephoto!"); |
From: Enlightenment C. <no...@cv...> - 2007-03-11 03:19:53
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_database.c ephoto_main.c Log Message: Change my mind on how I wanted to initialize the lists. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_database.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ephoto_database.c 11 Mar 2007 09:08:16 -0000 1.6 +++ ephoto_database.c 11 Mar 2007 09:19:53 -0000 1.7 @@ -11,7 +11,7 @@ static int image_id, album_id; /*Ephoto databasing ecore global variables*/ -static Ecore_List *albums = NULL, *images_list = NULL, *image_ids = NULL; +static Ecore_List *albums, *images_list, *image_ids; /*Open the sqlite3 database. Create the database if it does not already exits.*/ sqlite3 *ephoto_db_init(void) @@ -20,6 +20,10 @@ char path2[PATH_MAX]; sqlite3 *db; + albums = ecore_list_new(); + images_list = ecore_dlist_new(); + image_ids = ecore_list_new(); + snprintf(path, PATH_MAX, "%s/.ephoto/.ephoto_database", getenv("HOME")); snprintf(path2, PATH_MAX, "%s/.ephoto", getenv("HOME")); @@ -218,7 +222,7 @@ } images_list = ecore_dlist_new(); image_ids = ecore_list_new(); - + snprintf(command, PATH_MAX, "SELECT id FROM albums WHERE name = '%s';", album); sqlite3_exec(db, command, get_album_id, 0, 0); snprintf(command, PATH_MAX, "SELECT image_id FROM album_images WHERE album_id = '%d';", album_id); =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ephoto_main.c 11 Mar 2007 09:10:42 -0000 1.10 +++ ephoto_main.c 11 Mar 2007 09:19:53 -0000 1.11 @@ -55,8 +55,8 @@ em = NULL; em = calloc(1, sizeof(Ephoto_Main)); - em->albums = NULL; - em->images = NULL; + em->albums = ecore_list_new(); + em->images = ecore_dlist_new(); em->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(em->win), "Ephoto!"); @@ -189,7 +189,7 @@ album = data; } - if (em->images) + if (!ecore_list_is_empty(em->images)) { ecore_dlist_destroy(em->images); } |
From: Enlightenment C. <no...@cv...> - 2007-03-11 08:10:45
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_exif.c Log Message: Check to make sure img is pointing to somethin =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ephoto_exif.c 25 Feb 2007 04:30:57 -0000 1.9 +++ ephoto_exif.c 11 Mar 2007 14:10:42 -0000 1.10 @@ -107,6 +107,7 @@ ecore_list_set_free_cb(values, free); img = get_image(); + if(!img) return; exif_info = get_exif_data(img); if(ecore_hash_count(exif_info) == 0) |
From: Enlightenment C. <no...@cv...> - 2007-03-11 08:13:16
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_exif.c Log Message: Check to make sure img points at something. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ephoto_exif.c 11 Mar 2007 14:10:42 -0000 1.10 +++ ephoto_exif.c 11 Mar 2007 14:13:11 -0000 1.11 @@ -56,7 +56,7 @@ /*Get the current image*/ static const char *get_image(void) { - const char *img; + const char *img = NULL; if (VISIBLE(em->fbox_vbox) && em->currentf) { @@ -70,10 +70,7 @@ { img = ewl_image_file_path_get(EWL_IMAGE(em->eimage)); } - else - { - return NULL; - } + if(!img) return NULL; return strdup(img); } |
From: Enlightenment C. <no...@cv...> - 2007-03-12 18:52:38
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_list_view.c ephoto_main.c Log Message: Make thumbnails larger. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ephoto_list_view.c 11 Mar 2007 01:14:47 -0000 1.10 +++ ephoto_list_view.c 13 Mar 2007 00:52:16 -0000 1.11 @@ -97,7 +97,7 @@ image_pixels_int_get(image, &width, &height); img = add_image(w, image, 1, NULL, NULL); - ewl_image_constrain_set(EWL_IMAGE(img), 48); + ewl_image_constrain_set(EWL_IMAGE(img), 64); ewl_widget_name_set(w, image); size = ecore_file_size(image); =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ephoto_main.c 11 Mar 2007 09:19:53 -0000 1.11 +++ ephoto_main.c 13 Mar 2007 00:52:16 -0000 1.12 @@ -204,6 +204,7 @@ imagef = ecore_dlist_current(em->images); thumb = add_image(em->fbox, imagef, 1, set_info, NULL); + ewl_image_constrain_set(EWL_IMAGE(thumb), 64); ewl_object_alignment_set(EWL_OBJECT(thumb), EWL_FLAG_ALIGN_CENTER); ewl_widget_name_set(thumb, imagef); |
From: Enlightenment C. <no...@cv...> - 2007-03-13 01:35:28
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: Makefile.am ephoto.h ephoto_main.c Added Files: ephoto_slideshow.c Log Message: Slideshow now works. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 24 Feb 2007 23:30:49 -0000 1.2 +++ Makefile.am 13 Mar 2007 07:35:09 -0000 1.3 @@ -13,6 +13,7 @@ ephoto_main.c \ ephoto_nls.c \ ephoto_normal_view.c \ + ephoto_slideshow.c \ ephoto_utils.c ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ephoto.h 11 Mar 2007 01:14:47 -0000 1.7 +++ ephoto.h 13 Mar 2007 07:35:09 -0000 1.8 @@ -2,6 +2,7 @@ #define _EPHOTO_H_ #include "config.h" +#include <Ecore.h> #include <Ecore_Data.h> #include <Ecore_File.h> #include <Evas.h> @@ -85,8 +86,8 @@ Ewl_Widget *add_normal_view(Ewl_Widget *c); void set_info(Ewl_Widget *w, void *event, void *data); -/* Ephoto Thumbnail */ -void generate_thumbnail(Ewl_Widget *image, char *path); +/* Ephoto Slideshow */ +void start_slideshow(Ewl_Widget *w, void *event, void *data); /* Ephoto Utilities*/ const char *file_size_get(int size); =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ephoto_main.c 13 Mar 2007 00:52:16 -0000 1.12 +++ ephoto_main.c 13 Mar 2007 07:35:09 -0000 1.13 @@ -143,12 +143,11 @@ button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/get_exif.png", display_exif_dialog, NULL); ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30); ewl_attach_tooltip_text_set(button, "View Exif Data"); - button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/stock_fullscreen.png", window_fullscreen, NULL); ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30); ewl_attach_tooltip_text_set(button, "Toggle Fullscreen"); - button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/x-office-presentation.png", NULL, NULL); + button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/x-office-presentation.png", start_slideshow, NULL); ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30); ewl_attach_tooltip_text_set(button, "Start a Slideshow"); |
From: Enlightenment C. <no...@cv...> - 2007-03-14 15:55:41
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: ephoto_slideshow.c Log Message: This should not be freed. Fixes several problems. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_slideshow.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ephoto_slideshow.c 13 Mar 2007 07:35:09 -0000 1.1 +++ ephoto_slideshow.c 14 Mar 2007 21:55:39 -0000 1.2 @@ -25,7 +25,6 @@ ewl_image_file_set(EWL_IMAGE(image), image_path, NULL); - free(image_path); return 1; } @@ -46,7 +45,6 @@ change = ecore_timer_add(5, change_picture, w); - free(image_path); return; } |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:34:23
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: config.h.in ephoto.h ephoto_exif.c ephoto_main.c Log Message: Make libexif an optional requirement now. You do not have to have it to use ephoto. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/config.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- config.h.in 15 Feb 2007 19:13:48 -0000 1.2 +++ config.h.in 16 Mar 2007 04:34:22 -0000 1.3 @@ -1,5 +1,8 @@ /* src/bin/config.h.in. Generated from configure.in by autoheader. */ +/* Enable Exif Support */ +#undef BUILD_EXIF_SUPPORT + /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -19,9 +22,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <libexif/exif-data.h> header file. */ -#undef HAVE_LIBEXIF_EXIF_DATA_H /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ephoto.h 13 Mar 2007 07:35:09 -0000 1.8 +++ ephoto.h 16 Mar 2007 04:34:22 -0000 1.9 @@ -8,8 +8,10 @@ #include <Evas.h> #include <Ewl.h> #include <fnmatch.h> +#ifdef BUILD_EXIF_SUPPORT #include <libexif/exif-data.h> #include <libexif/exif-loader.h> +#endif #include <libgen.h> #include <limits.h> #include <sqlite3.h> @@ -47,8 +49,10 @@ Ecore_List *get_images(const char *directory); /* Ephoto Exif */ +#ifdef BUILD_EXIF_SUPPORT Ecore_Hash *get_exif_data(const char *file); void display_exif_dialog(Ewl_Widget *w, void *event, void *data); +#endif /* Ephoto Databasing */ sqlite3 *ephoto_db_init(void); =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_exif.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ephoto_exif.c 11 Mar 2007 14:13:11 -0000 1.11 +++ ephoto_exif.c 16 Mar 2007 04:34:22 -0000 1.12 @@ -1,5 +1,6 @@ #include "ephoto.h" +#ifdef BUILD_EXIF_SUPPORT static const char *get_image(void); static void close_dialog(Ewl_Widget *w, void *event, void *data); static void add_exif_to_container(Ewl_Widget *w, void *event, void *data); @@ -186,4 +187,4 @@ return; } - +#endif =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ephoto_main.c 13 Mar 2007 07:35:09 -0000 1.13 +++ ephoto_main.c 16 Mar 2007 04:34:22 -0000 1.14 @@ -116,7 +116,7 @@ ewl_container_child_append(EWL_CONTAINER(vbox), hsep); ewl_widget_show(hsep); - em->toolbar = ewl_toolbar_new(); + em->toolbar = ewl_htoolbar_new(); ewl_box_spacing_set(EWL_BOX(em->toolbar), 5); ewl_object_minimum_h_set(EWL_OBJECT(em->toolbar), 30); ewl_object_alignment_set(EWL_OBJECT(em->toolbar), EWL_FLAG_ALIGN_CENTER); @@ -140,10 +140,15 @@ ewl_container_child_append(EWL_CONTAINER(em->toolbar), vsep); ewl_widget_show(vsep); - button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/get_exif.png", display_exif_dialog, NULL); + button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/get_exif.png", NULL, NULL); ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30); + ewl_attach_tooltip_text_set(button, "You do not have libexif 0.6.13"); +#ifdef BUILD_EXIF_SUPPORT + ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, NULL); ewl_attach_tooltip_text_set(button, "View Exif Data"); - button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/stock_fullscreen.png", window_fullscreen, NULL); +#endif + + button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/stock_fullscreen.png", window_fullscreen, NULL); ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30); ewl_attach_tooltip_text_set(button, "Toggle Fullscreen"); |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:34:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/po Modified Files: ephoto.pot Log Message: Make libexif an optional requirement now. You do not have to have it to use ephoto. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/po/ephoto.pot,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ephoto.pot 15 Feb 2007 19:13:48 -0000 1.2 +++ ephoto.pot 16 Mar 2007 04:34:22 -0000 1.3 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-15 07:12-0600\n" +"POT-Creation-Date: 2007-03-15 17:29-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -15,22 +15,22 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/bin/ephoto_utils.c:43 +#: src/bin/ephoto_utils.c:9 #, c-format msgid "%'.0f Bytes" msgstr "" -#: src/bin/ephoto_utils.c:47 +#: src/bin/ephoto_utils.c:13 #, c-format msgid "%'.0f KB" msgstr "" -#: src/bin/ephoto_utils.c:51 +#: src/bin/ephoto_utils.c:17 #, c-format msgid "%'.0f MB" msgstr "" -#: src/bin/ephoto_utils.c:55 +#: src/bin/ephoto_utils.c:21 #, c-format msgid "%'.1f GB" msgstr "" |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:34:58
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto Modified Files: configure.in Log Message: Make libexif an optional requirement now. You do not have to have it to use ephoto. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.in 18 Feb 2007 02:38:28 -0000 1.3 +++ configure.in 16 Mar 2007 04:34:22 -0000 1.4 @@ -73,11 +73,19 @@ ) AC_SUBST(SQLITE_LIBS) -AC_CHECK_HEADERS(libexif/exif-data.h, - EXIF_LIBS="$EXIF_LIBS -lexif", - AC_MSG_ERROR([Ephoto needs libexif to compile.]) - ) -AC_SUBST(EXIF_LIBS) +if pkg-config --exists 'sqlite3 >= 3.3'; then + have_sqlite3="Yes" +else + have_sqlite3="No" + AC_MSG_ERROR([Ephoto needs sqlite3 to compile.]) +fi + +if pkg-config --exists 'libexif >= 0.6.13'; then + have_exif="Yes" + AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support]) +else + have_exif="No" +fi PROG="evas-config"; AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) @@ -182,8 +190,8 @@ echo " Edje ............: Yes" echo " Epsilon .........: Yes" echo " EWL .............: Yes" -echo " Libexif .........: Yes" -echo " Sqlite3 .........: Yes" +echo " Libexif .........: $have_exif" +echo " Sqlite3 .........: $have_sqlite3" echo echo "Installation Path.........: $prefix" echo |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:40:07
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/po Modified Files: ephoto.pot Log Message: Remove version restriction on sqlite3 because I am not sure which versions work. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/po/ephoto.pot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ephoto.pot 16 Mar 2007 04:34:22 -0000 1.3 +++ ephoto.pot 16 Mar 2007 04:40:05 -0000 1.4 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-15 17:29-0500\n" +"POT-Creation-Date: 2007-03-15 17:39-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL...@li...>\n" |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:40:12
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto Modified Files: configure.in Log Message: Remove version restriction on sqlite3 because I am not sure which versions work. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in 16 Mar 2007 04:34:22 -0000 1.4 +++ configure.in 16 Mar 2007 04:40:05 -0000 1.5 @@ -73,7 +73,7 @@ ) AC_SUBST(SQLITE_LIBS) -if pkg-config --exists 'sqlite3 >= 3.3'; then +if pkg-config --exists sqlite3; then have_sqlite3="Yes" else have_sqlite3="No" |
From: Enlightenment C. <no...@cv...> - 2007-03-15 22:41:45
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/po Removed Files: ephoto.pot Log Message: This doesn't need to be in cvs. |
From: Enlightenment C. <no...@cv...> - 2007-03-15 23:56:04
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: Makefile.am config.h.in Log Message: Rework some of the autofoo that goes along with making exif optional. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 13 Mar 2007 07:35:09 -0000 1.3 +++ Makefile.am 16 Mar 2007 05:56:00 -0000 1.4 @@ -18,7 +18,7 @@ ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror -ephoto_LDADD = @ewl_libs@ -lsqlite3 -lexif +ephoto_LDADD = @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@ EXTRA_DIST = \ ephoto.h =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- config.h.in 16 Mar 2007 04:34:22 -0000 1.3 +++ config.h.in 16 Mar 2007 05:56:00 -0000 1.4 @@ -26,9 +26,6 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the <sqlite3.h> header file. */ -#undef HAVE_SQLITE3_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H |
From: Enlightenment C. <no...@cv...> - 2007-03-15 23:56:04
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto Modified Files: configure.in Log Message: Rework some of the autofoo that goes along with making exif optional. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- configure.in 16 Mar 2007 04:40:05 -0000 1.5 +++ configure.in 16 Mar 2007 05:56:00 -0000 1.6 @@ -67,25 +67,25 @@ packagesrcdir=`cd $srcdir && pwd` AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory]) -AC_CHECK_HEADERS(sqlite3.h, - SQLITE_LIBS="$SQLITE_LIBS -lsqlite3", - AC_MSG_ERROR([Ephoto needs sqlite3 to compile.]) - ) -AC_SUBST(SQLITE_LIBS) +PKG_CHECK_MODULES([SQLITE], sqlite3, + [ + have_sqlite3="Yes" + ], + [ + have_sqlite3="No" + AC_MSG_ERROR([Ephoto needs sqlite3 to compile.]) + ] +) -if pkg-config --exists sqlite3; then - have_sqlite3="Yes" -else - have_sqlite3="No" - AC_MSG_ERROR([Ephoto needs sqlite3 to compile.]) -fi - -if pkg-config --exists 'libexif >= 0.6.13'; then - have_exif="Yes" - AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support]) -else - have_exif="No" -fi +PKG_CHECK_MODULES([EXIF], libexif >= 0.6.13, + [ + have_exif="Yes" + AC_DEFINE(BUILD_EXIF_SUPPORT, 1, [Enable Exif Support]) + ], + [ + have_exif="No" + ] +) PROG="evas-config"; AC_PATH_PROG(EVAS_CONFIG, $PROG, "", $PATH) |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:01:45
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Modified Files: Makefile.am Log Message: Add cflags. =================================================================== RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 16 Mar 2007 05:56:00 -0000 1.4 +++ Makefile.am 16 Mar 2007 06:01:44 -0000 1.5 @@ -16,7 +16,7 @@ ephoto_slideshow.c \ ephoto_utils.c -ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror +ephoto_CFLAGS = @ewl_cflags@ @SQLITE_CFLAGS@ @EXIF_CFLAGS@ -Wall -Werror ephoto_LDADD = @ewl_libs@ @SQLITE_LIBS@ @EXIF_LIBS@ |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:04:56
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src/bin Removed Files: config.h.in Log Message: This file shouldn't be in cvs. |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data/images Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data/themes Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data/themes/ephoto Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data/themes/ephoto/images Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:55
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/src Added Files: .cvsignore Log Message: Add cvsignores! |
From: Enlightenment C. <no...@cv...> - 2007-03-16 00:20:57
|
Enlightenment CVS committal Author : titan Project : e17 Module : apps/ephoto Dir : e17/apps/ephoto/data/themes/ephoto/fonts Added Files: .cvsignore Log Message: Add cvsignores! |