- 0.7.2, patch to fix crash at startup when no device is specified.

- Enable audio input driver support (portaudio).
- Improve package description.
- Don't ship static libraries.
- Drop pre Fedora Extras backwards compatibility hacks.
- Make svgalib support (smode2) build conditional, disabled by default.
- Simplify module package build (still work in progress, disabled by
    default).
- Other minor specfile cleanups and maintainability improvements.

.cvsignore

@@ -1 +1 @@
-lirc-0.7.1.tar.bz2
+lirc-0.7.2.tar.bz2

lirc-gpio.patch

@@ -0,0 +1,39 @@
+The gpio driver doesn't compile against kernel-devel due to missing
+drivers/media/video/{bttv,bttvp}.h.
+
+--- lirc-0.7.2/configure.drivers	2005-08-14 17:14:08.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 17:25:56.000000000 +0300
+@@ -8027,7 +8027,6 @@
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+ 	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_gpio) \
+ 	(lirc_dev lirc_i2c) \
+ 	(lirc_dev lirc_igorplugusb) \
+ 	(lirc_dev lirc_imon) \
+@@ -9382,7 +9381,6 @@
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+ 	lirc_cmdir \
+-	lirc_gpio \
+ 	lirc_i2c \
+ 	lirc_igorplugusb \
+ 	lirc_imon \
+--- lirc-0.7.2/configure.in.drivers	2005-08-14 13:23:48.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 17:28:15.000000000 +0300
+@@ -169,7 +169,6 @@
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+ 	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_gpio) \
+ 	(lirc_dev lirc_i2c) \
+ 	(lirc_dev lirc_igorplugusb) \
+ 	(lirc_dev lirc_imon) \
+@@ -1090,7 +1089,6 @@
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+ 	lirc_cmdir \
+-	lirc_gpio \
+ 	lirc_i2c \
+ 	lirc_igorplugusb \
+ 	lirc_imon \

lirc-nodev-crash.patch

@@ -0,0 +1,11 @@
+--- daemons/lircd.c~	2005-07-10 11:34:12.000000000 +0300
++++ daemons/lircd.c	2005-08-14 19:29:50.000000000 +0300
+@@ -1974,7 +1974,7 @@
+ 			"no peers are specified\n",progname);
+ 		return(EXIT_FAILURE);
+ 	}
+-	if(strcmp(hw.device, lircdfile)==0)
++	if(hw.device != NULL && strcmp(hw.device, lircdfile)==0)
+ 	{
+ 		fprintf(stderr, "%s: refusing to connect to myself\n",
+ 			progname);

lirc-nomodules.patch

@@ -0,0 +1,96 @@
+--- lirc-0.7.2/Makefile.am.orig	2003-05-07 19:31:48.000000000 +0300
++++ lirc-0.7.2/Makefile.am	2005-08-14 18:39:49.000000000 +0300
+@@ -9,7 +9,7 @@
+ EXTRA_DIST =  setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
+ 
+ ## daemons/ and tools/ should appear before doc/ for help2man to work.
+-SUBDIRS = drivers daemons tools doc
++SUBDIRS = daemons tools doc
+ 
+ ## From automake documentation:
+ ## Note that EXTRA_DIST can only handle files in the current
+--- lirc-0.7.2/configure.orig	2005-08-14 18:39:36.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 18:40:14.000000000 +0300
+@@ -7995,6 +7995,7 @@
+ echo "$ac_t""" 1>&6
+ 
+ possible_drivers="(none) \
++	(any) \
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -8020,26 +8021,6 @@
+ 	(uirt2_raw) \
+ 	(udp)"
+ 
+-if test x${no_kernel} != xyes; then
+-  possible_drivers="${possible_drivers} \
+-	(any) \
+-	(lirc_dev) \
+-	(lirc_dev lirc_atiusb) \
+-	(lirc_dev lirc_bt829) \
+-	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_i2c) \
+-	(lirc_dev lirc_igorplugusb) \
+-	(lirc_dev lirc_imon) \
+-	(lirc_dev lirc_it87) \
+-	(lirc_dev lirc_mceusb) \
+-	(lirc_dev lirc_mceusb2) \
+-	(lirc_dev lirc_parallel) \
+-	(lirc_dev lirc_sasem) \
+-	(lirc_dev lirc_serial) \
+-	(lirc_dev lirc_sir) \
+-	(lirc_dev lirc_streamzap)"
+-fi
+-
+ if test -n "${LIBUSB_CONFIG}"; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_LIBUSB 1
+--- lirc-0.7.2/Makefile.in.orig	2005-08-14 13:27:43.000000000 +0300
++++ lirc-0.7.2/Makefile.in	2005-08-14 18:39:49.000000000 +0300
+@@ -113,7 +113,7 @@
+ 
+ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
+ 
+-SUBDIRS = drivers daemons tools doc
++SUBDIRS = daemons tools doc
+ 
+ DISTCLEANFILES = configure.sh .setup.config
+ 
+--- lirc-0.7.2/configure.in.orig	2005-08-14 18:39:36.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 18:40:08.000000000 +0300
+@@ -137,6 +137,7 @@
+ AC_MSG_RESULT()
+ 
+ possible_drivers="(none) \
++	(any) \
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -162,26 +163,6 @@
+ 	(uirt2_raw) \
+ 	(udp)"
+ 
+-if test x${no_kernel} != xyes; then
+-  possible_drivers="${possible_drivers} \
+-	(any) \
+-	(lirc_dev) \
+-	(lirc_dev lirc_atiusb) \
+-	(lirc_dev lirc_bt829) \
+-	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_i2c) \
+-	(lirc_dev lirc_igorplugusb) \
+-	(lirc_dev lirc_imon) \
+-	(lirc_dev lirc_it87) \
+-	(lirc_dev lirc_mceusb) \
+-	(lirc_dev lirc_mceusb2) \
+-	(lirc_dev lirc_parallel) \
+-	(lirc_dev lirc_sasem) \
+-	(lirc_dev lirc_serial) \
+-	(lirc_dev lirc_sir) \
+-	(lirc_dev lirc_streamzap)"
+-fi
+-
+ if test -n "${LIBUSB_CONFIG}"; then
+   AC_DEFINE(HAVE_LIBUSB)
+   possible_drivers="${possible_drivers} (atilibusb)"

lirc-optflags.patch

@@ -0,0 +1,18 @@
+--- lirc-0.7.2/configure.in.optflags	2005-08-14 17:53:43.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 17:54:18.000000000 +0300
+@@ -17,5 +17,5 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+-CFLAGS="-O2 -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ 
+ dnl Checks for programs.
+--- lirc-0.7.2/configure.optflags	2005-08-14 17:53:50.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 17:54:07.000000000 +0300
+@@ -1076,5 +1076,5 @@
+ 
+ 
+-CFLAGS="-O2 -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.

lirc.spec

@@ -1,25 +1,21 @@
 # Driver TODO, sometime maybe:
-# - audio (req: portaudio)
+# - caraca (req: caraca, http://caraca.sf.net/)
-# - caraca (req: caraca_client)
+# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
-# - irman: (req: libirman)
-# - drivers that need drivers/media/video/bttv*.h (not in kernel-devel)
-#   - gpio: avermedia avermedia98 flyvideo
 # Other TODO:
 # - move to -devel (?): irw, *mode2, others?
+#   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 # - Verify that the kernel modules work and correct /dev entries get created
 #   automagically with proper permissions etc.
 
-%{!?kernel: %{expand: %%define kernel %(uname -r)}}
+%{!?kver: %{expand: %%define kver %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu}
+%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
-
+%define mdir /lib/modules/%{kver}/extra
-# Kernel module drivers
-%define drivers atiusb com1 hauppauge igorplugusb imon it87 lpt1 mceusb sasem sir_com3 streamzap tekram_bt829
 
 Name:           lirc
-Version:        0.7.1
+Version:        0.7.2
-Release:        3
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,19 +24,31 @@ URL:            http://www.lirc.org/
 Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-gpio.patch
+Patch2:         %{name}-nomodules.patch
+Patch3:         %{name}-nodev-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}
 %if 0%{!?_with_modules:1}
-BuildRequires:  alsa-lib-devel XFree86-devel libusb-devel
+BuildRequires:  %{__perl}
-BuildConflicts: svgalib-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  libusb-devel
+BuildRequires:  portaudio-devel >= 18
+Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
 %endif
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-LIRC is the Linux Infrared Remote Control package.
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.
 
 %package        devel
 Summary:        Development files for LIRC
@@ -50,74 +58,59 @@ Requires:       %{name} = %{version}-%{release}
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kernel}
+%package     -n kernel-module-%{name}-%{kver}
 Summary:        Kernel modules for LIRC
 Group:          System Environment/Kernel
 Provides:       kernel-module
 Provides:       kernel-module-%{name} = %{version}
 %if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kernel}
+BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
 %endif
 Requires:       %{name} = %{version}
-Requires:       modutils
+Requires:       module-init-tools
-Requires:       kernel-%{_target_cpu} = %{kernel}
+Requires:       kernel-%{_target_cpu} = %{kver}
 Requires:       udev
 
-%description -n kernel-module-%{name}-%{kernel}
+%description -n kernel-module-%{name}-%{kver}
 LIRC kernel modules built for kernel
-%{kernel} (%{_target_cpu}).
+%{kver} (%{_target_cpu}).
 
 
 %prep
 %setup -q
-%{__perl} -pi -e 's|^CFLAGS="-O2 -g -Wall"|CFLAGS="\$CFLAGS -Wall"|' configure
+%patch0 -p1
+%patch1 -p1
+# patch2 needs to be applied on top of patch1
+%{!?_with_modules:%patch2 -p1}
+%patch3 -p0
 chmod 644 contrib/*
+touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
 %build
-%if 0%{?_with_modules:1}
-for driver in %{drivers} ; do
-  # lpt1 is not smp safe @@@ TODO: verify this?
-  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
-  mkdir -p buildroot/"$driver"
 %configure \
-    --enable-sandboxed \
+  --disable-static \
-    --enable-debug \
   --disable-dependency-tracking \
-    --with-kerneldir=%{ksrc} \
-    --with-moduledir=/tmp \
-    --with-driver=$driver
-  make %{?_smp_mflags} -C drivers
-  make -C drivers install DESTDIR=$PWD/buildroot/$driver
-done
-
-%else
-%configure \
-  --with-syslog=LOG_DAEMON \
-  --enable-sandboxed \
   --enable-debug \
-  --disable-dependency-tracking \
+  --enable-sandboxed \
+  --with-syslog=LOG_DAEMON \
+  --with-kerneldir=%{ksrc} \
+  --with-moduledir=%{mdir}/%{name} \
   --with-driver=any
-make %{?_smp_mflags}
+make %{?_smp_mflags} %{?_with_modules:-C drivers}
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
 %if 0%{?_with_modules:1}
-for driver in %{drivers} ; do
+make install DESTDIR=$RPM_BUILD_ROOT -C drivers
-  # lpt1 is not SMP safe @@@ TODO: verify this?
+# executable here to allow stripping, fixed later in %%files
-  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
+chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
-  install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
-  # 0755 here to allow stripping, fixed later in %%files
-  install -pm 755 buildroot/$driver/tmp/* \
-    $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
-done
 
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1* # if no svgalib
+%{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,6 +126,7 @@ cd ..
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 %endif
 
 
@@ -143,20 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
-# Backwards compatibility (init script lircd -> lirc rename),
-# drop this in FC5:
-if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then
-  %{_initrddir}/lircd status >/dev/null 2>&1
-  ret=$?
-  %{_initrddir}/lircd stop >/dev/null || :
-  /sbin/chkconfig --del lircd || :
-  if [ $ret -eq 0 ] ; then
-    %{_initrddir}/lirc start >/dev/null || :
-  fi
-fi
 
-%post -n kernel-module-%{name}-%{kernel}
+%post -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -170,8 +153,8 @@ if [ $1 -gt 0 ] ; then
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kernel}
+%postun -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
 %if 0%{!?_with_modules:1}
@@ -180,7 +163,7 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
 %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
-%config %{_initrddir}/lirc
+%{_initrddir}/lirc
 %{_bindir}/ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
@@ -192,20 +175,28 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/lirc
+%{_includedir}/lirc/
-%{_libdir}/liblirc_client.a
 %{_libdir}/liblirc_client.so
-%exclude %{_libdir}/liblirc_client.la
 %endif
 
 %if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kernel}
+%files -n kernel-module-%{name}-%{kver}
 %defattr(644,root,root,755)
-/lib/modules/%{kernel}/updates
+%{mdir}/
 %endif
 
 
 %changelog
+* Sun Aug 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-2
+- 0.7.2, patch to fix crash at startup when no device is specified.
+- Enable audio input driver support (portaudio).
+- Improve package description.
+- Don't ship static libraries.
+- Drop pre Fedora Extras backwards compatibility hacks.
+- Make svgalib support (smode2) build conditional, disabled by default.
+- Simplify module package build (still work in progress, disabled by default).
+- Other minor specfile cleanups and maintainability improvements.
+
 * Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-3
 - Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon,
   sasem, and streamzap to the list of modules to build.  This stuff is still

sources

@@ -1 +1 @@
-642e543e25dd6ad72416784bb6166d54  lirc-0.7.1.tar.bz2
+4510cf711f5c146f80c5bdfd61ca3f4a  lirc-0.7.2.tar.bz2