aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-05 16:00:47 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-09-05 16:00:47 -0300
commitb99c1249ef357bda32b2bbc0aab773fb32c51eab (patch)
treeeb826760f20086ca087d7fc98dface974cf6d3da
parent3da0b5d1e0b81698b565ff43859e23d023c06996 (diff)
Change default to build with Gtk3
That allows working with Wayland and HiDPI displays. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r--ChangeLog1
-rwxr-xr-xconfigure18
-rw-r--r--configure.ac8
3 files changed, 14 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 63600e7..74247ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* Fix coding style issues
* Fix Wayland camera display with Gtk 3
* Scale image if camera resolution is too high
+ * Change default to use gtk3
* Prevent a potential bug with YUV420 format.
2018-09-03 Mauro Carvalho Chehab <mchehab@kernel.org>
diff --git a/configure b/configure
index cf936dc..3a00aa5 100755
--- a/configure
+++ b/configure
@@ -764,7 +764,7 @@ with_libiconv_prefix
with_libintl_prefix
enable_compile_warnings
enable_Werror
-enable_gtk3
+enable_gtk2
with_gconf_source
with_gconf_schema_file_dir
enable_schemas_install
@@ -1412,7 +1412,7 @@ Optional Features:
--enable-compile-warnings=[no/yes/error]
Enable compiler warnings and errors
--disable-Werror Unconditionally make all compiler warnings non-fatal
- --enable-gtk3 Compile against GTK 3.x instead of GTK 2.x
+ --enable-gtk2 Compile against GTK 2.x instead of GTK 3.x
--disable-schemas-install
Disable the schemas installation
@@ -9633,20 +9633,20 @@ fi
-# Check whether --enable-gtk3 was given.
-if test "${enable_gtk3+set}" = set; then :
- enableval=$enable_gtk3; enable_gtk3=$enableval
+# Check whether --enable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then :
+ enableval=$enable_gtk2; enable_gtk2=$enableval
else
- enable_gtk3="no"
+ enable_gtk2="no"
fi
pkg_modules="gdk-pixbuf-2.0 gconf-2.0"
-if test "x$enable_gtk3" = xyes; then
- pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
-else
+if test "x$enable_gtk2" = xyes; then
pkg_modules="$pkg_modules gtk+-2.0 >= 2.24"
+else
+ pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
fi
diff --git a/configure.ac b/configure.ac
index c3df288..dcc4b26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,14 +36,14 @@ AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/ioctl.h unistd.h linux/videodev.
AX_IS_RELEASE(always)
AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
-AC_ARG_ENABLE(gtk3, [AC_HELP_STRING([--enable-gtk3], [Compile against GTK 3.x instead of GTK 2.x])], [enable_gtk3=$enableval], [enable_gtk3="no"])
+AC_ARG_ENABLE(gtk2, [AC_HELP_STRING([--enable-gtk2], [Compile against GTK 2.x instead of GTK 3.x])], [enable_gtk2=$enableval], [enable_gtk2="no"])
pkg_modules="gdk-pixbuf-2.0 gconf-2.0"
-if test "x$enable_gtk3" = xyes; then
- pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
-else
+if test "x$enable_gtk2" = xyes; then
pkg_modules="$pkg_modules gtk+-2.0 >= 2.24"
+else
+ pkg_modules="$pkg_modules gtk+-3.0 >= 3.10 cairo"
fi
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])

Privacy Policy