Update to svn revision 1200

- Drop all our patches (these are all upstream now)
- Rebuild for new libftdi
- Fix FTBFS (rhbz#1037152)
This commit is contained in:
Hans de Goede 2014-05-28 16:22:39 +02:00
parent aa155e8655
commit 4b889d3860
7 changed files with 30 additions and 86 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/lcd4linux-trunk-1143.zip
/lcd4linux-trunk-1200.zip

View File

@ -0,0 +1,12 @@
diff -up trunk/lcd4linux.conf.sample~ trunk/lcd4linux.conf.sample
--- trunk/lcd4linux.conf.sample~ 2014-05-28 15:35:38.000000000 +0200
+++ trunk/lcd4linux.conf.sample 2014-05-28 16:14:47.131447306 +0200
@@ -519,7 +519,7 @@ Display ASTUSB {
Display XWindow {
Driver 'X11'
Size '120x32'
- Font '5x8'
+ Font '6x8'
Pixel '4+1'
Gap '-1x-1'
Border 20

View File

@ -1,39 +0,0 @@
diff -ur trunk/plugin_i2c_sensors.c trunk.new/plugin_i2c_sensors.c
--- trunk/plugin_i2c_sensors.c 2010-01-17 14:40:02.000000000 +0100
+++ trunk.new/plugin_i2c_sensors.c 2011-02-20 15:52:34.868010987 +0100
@@ -223,6 +223,8 @@
int done;
if (!strcmp(method, "sysfs")) {
+ base = "/sys/class/hwmon/";
+ } else if (!strcmp(method, "sysfs-old")) {
base = "/sys/bus/i2c/devices/";
} else if (!strcmp(method, "procfs")) {
base = "/proc/sys/dev/sensors/";
@@ -259,6 +261,16 @@
done = 1;
break;
}
+ if (!strcmp(file->d_name, "device")) {
+ char fname[PATH_MAX];
+ snprintf(fname, PATH_MAX, "%sdevice/temp1_input", dname);
+ if (access(fname, R_OK) == 0) {
+ path = realloc(path, strlen(dname) + 7);
+ sprintf(path, "%sdevice/", dname);
+ done = 1;
+ break;
+ }
+ }
}
closedir(fd2);
if (done)
@@ -281,6 +293,8 @@
/* debug("No path to i2c sensors found in the conf, calling my_i2c_sensors_path()"); */
my_i2c_sensors_path("sysfs");
if (!path)
+ my_i2c_sensors_path("sysfs-old");
+ if (!path)
my_i2c_sensors_path("procfs");
if (!path) {
Only in trunk.new: plugin_i2c_sensors.c~

View File

@ -1,14 +0,0 @@
diff -up trunk/drv_st2205.c~ trunk/drv_st2205.c
--- trunk/drv_st2205.c~ 2009-01-28 21:18:52.000000000 +0100
+++ trunk/drv_st2205.c 2011-02-20 16:34:40.145011016 +0100
@@ -142,8 +142,8 @@ static int drv_st2205_start2(const char
fb = malloc(h->height * h->width * 3);
/* set width/height from st2205 firmware specs */
- DROWS = h->width;
- DCOLS = h->height;
+ DROWS = h->height;
+ DCOLS = h->width;
return 0;
}

View File

@ -1,12 +0,0 @@
diff -up trunk/plugins.m4~ trunk/plugins.m4
--- trunk/plugins.m4~ 2010-01-28 17:19:58.000000000 +0100
+++ trunk/plugins.m4 2011-02-20 11:07:17.459573019 +0100
@@ -568,7 +568,7 @@ fi
# WLAN
if test "$PLUGIN_WIRELESS" = "yes"; then
- AC_CHECK_HEADERS(linux/wireless.h, [has_wireless_header="true"], [has_wireless_header="false"])
+ AC_CHECK_HEADERS(linux/wireless.h, [has_wireless_header="true"], [has_wireless_header="false"], [#include <sys/socket.h>])
if test "$has_wireless_header" = "true"; then
PLUGINS="$PLUGINS plugin_wireless.o"
AC_DEFINE(PLUGIN_WIRELESS,1,[wireless plugin])

View File

@ -1,29 +1,27 @@
%global svn_rev 1143
%global svn_rev 1200
Name: lcd4linux
Version: 0.11
# We package an svn snapshot of what will become 0.11 since upstream has
# neglected to do a new release for ages
Release: 0.8.svn%{svn_rev}%{?dist}
Release: 0.9.svn%{svn_rev}%{?dist}
Summary: Display system state on an external LCD display
Group: Applications/System
License: GPLv2+
URL: http://ssl.bulix.org/projects/lcd4linux/
# This is the non rpmbuild parsable url:
# http://ssl.bulix.org/projects/lcd4linux/changeset/1143/trunk?old_path=%2F&format=zip
# Note replace 1143 with svn_rev!
Source0: lcd4linux-trunk-1143.zip
# http://ssl.bulix.org/projects/lcd4linux/changeset/1200/trunk?old_path=%2F&format=zip
# Note replace 1200 with svn_rev!
Source0: lcd4linux-trunk-1200.zip
# Courtesey of Debain
Source1: lcd4linux.8
Source2: lcd4X11.sh
Source3: lcd4X11.desktop
Source4: README.fedora
Patch0: lcd4linux-wireless.patch
Patch1: lcd4linux-hwmon.patch
Patch2: lcd4linux-st2205-width-height-swap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: lcd4linux-XWindow-conf.patch
BuildRequires: gd-devel ncurses-devel libX11-devel libICE-devel sqlite-devel
BuildRequires: serdisplib-devel libusb-devel libftdi-devel libst2205-devel
BuildRequires: serdisplib-devel libusb-devel libusb1-devel libftdi-devel
BuildRequires: libjpeg-devel libst2205-devel
BuildRequires: libvncserver-devel gettext-devel dbus-devel
BuildRequires: libtool desktop-file-utils
ExcludeArch: s390 s390x
@ -36,8 +34,6 @@ and some subsystems and displays it on an external liquid crystal display.
%prep
%setup -q -n trunk
%patch0 -p1
%patch1 -p1
%patch2 -p1
chmod +x bootstrap configure
./bootstrap
cp -a %{SOURCE4} .
@ -47,7 +43,7 @@ cp -a %{SOURCE4} .
%configure
make %{?_smp_mflags}
sed -e "s@#Display 'XWindow'@Display 'XWindow'@" \
-e "s@Display 'GLCD2USB'@#Display 'GLCD2USB'@" \
-e "s@Display 'ACool'@#Display 'ACool'@" \
-e "s@Layout 'TestLayer'@#Layout 'TestLayer'@" \
-e "s@#Layout 'Default'@Layout 'Default'@" \
lcd4linux.conf.sample > lcd4X11.conf
@ -55,8 +51,7 @@ touch -r lcd4linux.conf.sample lcd4X11.conf
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@ -67,12 +62,7 @@ install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/lcd4X11
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README.fedora lcd4linux.conf.sample
%config(noreplace) %{_sysconfdir}/lcd4X11.conf
%{_bindir}/%{name}
@ -83,6 +73,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Wed May 28 2014 Hans de Goede <hdegoede@redhat.com> - 0.11-0.9.svn1200
- Update to svn revision 1200
- Drop all our patches (these are all upstream now)
- Rebuild for new libftdi
- Fix FTBFS (rhbz#1037152)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-0.8.svn1143
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

View File

@ -1 +1 @@
bba2a6ab52ab78203f36ee06edcc8d04 lcd4linux-trunk-1143.zip
697f225ef271a370bab2b8f8375a76df lcd4linux-trunk-1200.zip