Hello community, here is the log from the commit of package kmscon for openSUSE:Factory checked in at 2014-08-13 17:08:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmscon (Old) and /work/SRC/openSUSE:Factory/.kmscon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmscon" Changes: -------- --- /work/SRC/openSUSE:Factory/kmscon/kmscon.changes 2013-10-20 10:52:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmscon.new/kmscon.changes 2014-08-13 17:08:06.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Aug 3 22:57:56 UTC 2014 - [email protected] + +- Update to new upstream release 8 +* wlterm and libuvt were removed (in a separate package now) +* The freetype2 font backend and cairo text renderer were removed +* Dynamic font resizing is now supported. + Use Ctrl-Plus and Ctrl-Minus for this. + +------------------------------------------------------------------- Old: ---- kmscon-7+git52.tar.xz New: ---- kmscon-8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmscon.spec ++++++ --- /var/tmp/diff_new_pack.cLDU8n/_old 2014-08-13 17:08:08.000000000 +0200 +++ /var/tmp/diff_new_pack.cLDU8n/_new 2014-08-13 17:08:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kmscon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Adam Mizerski <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -17,12 +17,8 @@ # -%define eloop_sover 1 -%define tsm_sover 1 -%define uterm_sover 1 - Name: kmscon -Version: 7+git52 +Version: 8 Release: 0 Summary: Linux KMS/DRM based virtual Console Emulator License: MIT @@ -31,32 +27,28 @@ #Git-Clone: git://github.com/dvdhrm/kmscon #DL-URL: http://people.freedesktop.org/~dvdhrm/kmscon/releases/ -#Snapshot: kmscon-7-52-g2d191bd -Source: %name-%version.tar.xz +Source: http://www.freedesktop.org/software/kmscon/releases/%name-%version.tar.xz Patch1: kmscon-no-date-time.patch Patch2: kmscon-x-linking.patch BuildRequires: autoconf >= 2.68 BuildRequires: automake >= 1.11 BuildRequires: docbook-xsl-stylesheets BuildRequires: libtool >= 2.2 +BuildRequires: libtsm-devel = 3 BuildRequires: pax-utils BuildRequires: pkgconfig BuildRequires: xsltproc BuildRequires: xz -BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(egl) -BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) -BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(libudev) >= 172 BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangoft2) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(xkbcommon) # O/P added for 13.1 Obsoletes: %name-service < %version-%release @@ -67,69 +59,16 @@ It is an attempt to replace the in-kernel VT implementation with a userspace console. -%package -n wlterm -Summary: Wayland native client terminal emulator -Group: Productivity/Other -# There is System/X11/Terminals, but wayland is not X11 and there is no group for Wayland - -%description -n wlterm -Wayland native client terminal emulator. - -%package -n libeloop%eloop_sover -Summary: Epoll-based Event-Loop Library -Group: System/Libraries - -%description -n libeloop%eloop_sover -Epoll-based Event-Loop Library. - -%package -n libeloop-devel -Summary: Development libraries for libeloop -Group: Development/Libraries/C and C++ -Requires: libeloop%eloop_sover = %version - -%description -n libeloop-devel -Development libraries for libeloop. - -%package -n libtsm%tsm_sover -Summary: Terminal-emulator State Machine -Group: System/Libraries - -%description -n libtsm%tsm_sover -Terminal-emulator State Machine. - -%package -n libtsm-devel -Summary: Development libraries for libtsm -Group: Development/Libraries/C and C++ -Requires: libtsm%tsm_sover = %version - -%description -n libtsm-devel -Development libraries for libtsm. - -%package -n libuterm%uterm_sover -Summary: User-space Terminal Video/Input/Hotplug/etc Helper Library -Group: System/Libraries - -%description -n libuterm%uterm_sover -User-space Terminal Video/Input/Hotplug/etc Helper Library. - -%package -n libuterm-devel -Summary: Development libraries for libuterm -Group: Development/Libraries/C and C++ -Requires: libuterm%uterm_sover = %version - -%description -n libuterm-devel -Development libraries for libuterm. - %prep -%setup -qn %name -%patch -P 1 -p1 -P 2 -p1 +%setup -q +%patch -P 1 -P 2 -p1 %build -echo "#define BUILD_GIT_HEAD \"unknown-revision\"" > src/githead.h +##echo "#define BUILD_GIT_HEAD \"unknown-revision\"" > src/githead.h mkdir -p m4 autoreconf -fiv -%configure --enable-wlterm --enable-debug --disable-static -make %{?_smp_mflags} V=1 +%configure --enable-debug --disable-static +make V=1 # %{?_smp_mflags} V=1 %install b="%buildroot" @@ -151,13 +90,6 @@ %postun %service_del_postun %name.service -%post -n libeloop%eloop_sover -p /sbin/ldconfig -%postun -n libeloop%eloop_sover -p /sbin/ldconfig -%post -n libtsm%tsm_sover -p /sbin/ldconfig -%postun -n libtsm%tsm_sover -p /sbin/ldconfig -%post -n libuterm%uterm_sover -p /sbin/ldconfig -%postun -n libuterm%uterm_sover -p /sbin/ldconfig - %files %defattr(-,root,root) %_bindir/%name @@ -166,38 +98,4 @@ %_mandir/man1/kmscon.1* %_unitdir/kmscon*.service -%files -n wlterm -%defattr(-,root,root) -%_bindir/wlterm - -%files -n libeloop%eloop_sover -%defattr(-,root,root) -%_libdir/libeloop.so.* - -%files -n libeloop-devel -%defattr(-,root,root) -%_includedir/eloop.h -%_libdir/libeloop.so -%_libdir/pkgconfig/libeloop.pc - -%files -n libtsm%tsm_sover -%defattr(-,root,root) -%_libdir/libtsm.so.* - -%files -n libtsm-devel -%defattr(-,root,root,-) -%_includedir/tsm*.h -%_libdir/libtsm.so -%_libdir/pkgconfig/libtsm.pc - -%files -n libuterm%uterm_sover -%defattr(-,root,root) -%_libdir/libuterm.so.* - -%files -n libuterm-devel -%defattr(-,root,root,-) -%_includedir/uterm*.h -%_libdir/libuterm.so -%_libdir/pkgconfig/libuterm.pc - %changelog ++++++ kmscon-7+git52.tar.xz -> kmscon-8.tar.xz ++++++ ++++ 68828 lines of diff (skipped) ++++++ kmscon-x-linking.patch ++++++ --- /var/tmp/diff_new_pack.cLDU8n/_old 2014-08-13 17:08:08.000000000 +0200 +++ /var/tmp/diff_new_pack.cLDU8n/_new 2014-08-13 17:08:08.000000000 +0200 @@ -1,53 +1,28 @@ ---- kmscon-7_git201309121138.orig/Makefile.am -+++ kmscon-7_git201309121138/Makefile.am -@@ -225,7 +225,8 @@ libeloop_la_SOURCES = \ - src/eloop.c - - libeloop_la_LIBADD = libshl.la --libeloop_la_CPPFLAGS = $(AM_CPPFLAGS) -+libeloop_la_CPPFLAGS = $(AM_CPPFLAGS) \ -+ $(XKBCOMMON_CFLAGS) - EXTRA_libeloop_la_DEPENDENCIES = ${top_srcdir}/docs/sym/libeloop.sym - libeloop_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -@@ -484,6 +485,10 @@ module_LTLIBRARIES += mod-unifont.la - noinst_PROGRAMS += genunifont - endif - -+mod_unifont_la_CPPFLAGS= \ -+ $(AM_CPPFLAGS) \ -+ $(XKBCOMMON_CFLAGS) -+ - mod_unifont_la_SOURCES = \ - src/kmscon_module_interface.h \ - src/font_unifont.c \ -@@ -527,7 +532,8 @@ mod_pango_la_SOURCES = \ - src/kmscon_mod_pango.c - mod_pango_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -- $(PANGO_CFLAGS) -+ $(PANGO_CFLAGS) \ -+ $(XKBCOMMON_CFLAGS) - mod_pango_la_LIBADD = \ - $(PANGO_LIBS) \ - -lpthread \ -@@ -546,6 +552,9 @@ mod_bbulk_la_SOURCES = \ - src/kmscon_module_interface.h \ - src/text_bbulk.c \ - src/kmscon_mod_bbulk.c -+mod_bbulk_la_CPPFLAGS = \ -+ $(AM_CPPFLAGS) \ -+ $(XKBCOMMON_CFLAGS) - mod_bbulk_la_LIBADD = libshl.la - mod_bbulk_la_LDFLAGS = \ - $(AM_LDFLAGS) \ -@@ -568,7 +577,8 @@ nodist_mod_gltex_la_SOURCES = \ - src/static_shaders.c - mod_gltex_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ -- $(GLES2_CFLAGS) -+ $(GLES2_CFLAGS) \ -+ $(XKBCOMMON_CFLAGS) - mod_gltex_la_LIBADD = \ - $(GLES2_LIBS) \ - libshl.la + +libtool: compile: gcc -std=gnu99 -DHAVE_CONFIG_H -I. -DBUILD_MODULE_DIR=\"/usr/lib64/kmscon\" -include ./config.h -I ./src -Wall -pipe -fno-common -ffast-math -fdiagnostics-show-option -fno-strict-aliasing -fvisibility=hidden -ffunction-sections -fdata-sections -fstack-protector -g -O2 -fmessage-length=0 -grecord-gcc-switches -fstack-protector -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables -fasynchronous-unwind-tables -g -c src/kmscon_mod_unifont.c -fPIC -DPIC -o src/.libs/kmscon_mod_unifont.o +In file included from src/kmscon_module_interface.h:38:0, + from src/kmscon_mod_unifont.c:34: +src/shl_misc.h:44:33: fatal error: xkbcommon/xkbcommon.h: No such file or directory + #include <xkbcommon/xkbcommon.h> + +libtool: compile: gcc -std=gnu99 -DHAVE_CONFIG_H -I. -DBUILD_MODULE_DIR=\"/usr/lib64/kmscon\" -include ./config.h -I ./src -I/usr/include/pkg/libxkbcommon -Wall -pipe -fno-common -ffast-math -fdiagnostics-show-option -fno-strict-aliasing -fvisibility=hidden -ffunction-sections -fdata-sections -fstack-protector -g -O2 -fmessage-length=0 -grecord-gcc-switches -fstack-protector -O2 -Wall -D_FORTIFY_SOURCE=2 -funwind-tables -fasynchronous-unwind-tables -g -c src/text_bbulk.c -fPIC -DPIC -o src/.libs/text_bbulk.o +In file included from src/text_bbulk.c:40:0: +src/text.h:37:20: fatal error: libtsm.h: No such file or directory + #include <libtsm.h> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: kmscon-8/Makefile.am +=================================================================== +--- kmscon-8.orig/Makefile.am ++++ kmscon-8/Makefile.am +@@ -65,7 +65,7 @@ AM_CFLAGS = \ + AM_CPPFLAGS = \ + -DBUILD_MODULE_DIR='"$(moduledir)"' \ + -include $(top_builddir)/config.h \ +- -I $(srcdir)/src ++ -I $(srcdir)/src $(XKBCOMMON_CFLAGS) $(TSM_CFLAGS) + AM_LDFLAGS = \ + -Wl,--as-needed \ + -Wl,--gc-sections \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
