rpms/sidplay-libs/devel sidplay-libs.spec, NONE, 1.1 sidplay-libs_2.1.1-5.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Linus Walleij snirkel at rpmfusion.org
Tue Nov 11 00:53:28 CET 2008


Author: snirkel

Update of /cvs/nonfree/rpms/sidplay-libs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1517/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sidplay-libs.spec sidplay-libs_2.1.1-5.diff 
Log Message:
Initial import to rpmfusion, hopefully working now



--- NEW FILE sidplay-libs.spec ---
# SPEC file for sidplay-libs, primary target is the Fedora 
# RPM repository. Uses portion of the RPM for Mandriva by
# Goetz Waschk and Simon White.

Name:           sidplay-libs
Version:        2.1.1
Release:        6%{?dist}
Summary:        A software library for playing back C64 SID files
URL:            http://sidplay2.sourceforge.net/
Group:          System Environment/Libraries
Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# This patch is just lifted from Debian, here:
# http://packages.debian.org/etch/libsidplay2
Patch0:         sidplay-libs_2.1.1-5.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License:        GPLv2+
BuildRequires:  automake
BuildRequires:  autoconf
BuildRequires:  libtool

%description
This package provides a software library for controlling emulation on the low 
machine-level of a MOS Technology SID chip and a MOS Technology 6510 processor.
Physical emulation internally utilize the resid library or alternatively use 
a hardware SID chip if the apropriate hardware ("hardsid") is installed. The
resid library is included with sidplay-libs.

%package devel
Summary:        Development files for sidplay-libs
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
# We require libsidplay, since that version owns the subdirectory
# "sidplay" in %{_includedir}.
Requires:       libsidplay-devel
Requires:	pkgconfig

%description devel
This package contains development files for the MOS Techology SID and
6510 chip emulator layer sidplay-libs.

%package static
Summary:        Static libraries and libtool archives for sidplay-libs
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-devel = %{version}-%{release}

%description static
This package contains some static libraries from sidplay-libs, which are
needed at compile-time by e.g. sidplay2, since it makes use of the
libtool archives.

%prep
%setup -q
%patch0 -p1
# Update to recent GNU autotools.
mkdir -p resid/unix
for i in libsidplay builders/{resid-builder,hardsid-builder} resid . ; do
    pushd $i
    aclocal -I unix
    libtoolize --copy --force
    automake
    autoconf
    popd
done

# Fix spurious permission problem (it's not installed
# with this permission, but anyway...)
chmod -x libsidutils/include/sidplay/utils/SidUsage.h

%build
# Cannot use --disable-static here, the builder need static
# libraries to work at all.
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

# Hack to prevent relinking, from Mandriva package.
# sed s/relink_command.*// < libsidutils/src/libsidutils.la > tmp.la
# mv tmp.la libsidutils/src/libsidutils.la
make install DESTDIR=$RPM_BUILD_ROOT

# Move stuff around - making install from the build
# tree for some reason put all files in all the wrong
# places.
mkdir $RPM_BUILD_ROOT%{_libdir}/sidplay
mkdir $RPM_BUILD_ROOT%{_libdir}/sidplay/builders
mv $RPM_BUILD_ROOT%{_libdir}/libhardsid-builder* \
   $RPM_BUILD_ROOT%{_libdir}/sidplay/builders
mv $RPM_BUILD_ROOT%{_libdir}/libresid-builder* \
   $RPM_BUILD_ROOT%{_libdir}/sidplay/builders

# Needed in Mandrake spec?
# chrpath -d %buildroot%{_libdir}/libsidutils.so

# This stuff cannot be removed as of now: it is referenced
# internally and used by the library configuration.
# Remove static libraries
# rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
# Remove libtool archive remnants
# rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc libsidplay/AUTHORS libsidplay/ChangeLog libsidplay/README libsidplay/TODO libsidplay/COPYING
%{_libdir}/*.so.*

%files devel
%defattr(-, root, root)
# The "libsidplay" package owns %{_includedir}/sidplay
%dir %{_includedir}/sidplay/builders
%dir %{_includedir}/sidplay/utils
%dir %{_libdir}/sidplay
%{_libdir}/*.so
%{_includedir}/sidplay/*.h
%{_includedir}/sidplay/builders/*.h
%{_includedir}/sidplay/utils/*.h
# pkgconfig owns this dir
%{_libdir}/pkgconfig/*.pc

%files static
%dir %{_libdir}/sidplay/builders
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/sidplay/builders/*.a
%{_libdir}/sidplay/builders/*.la

%changelog
* Mon Dec 10 2007 Linus Walleij <triad at df.lth.se> 2.1.1-6
- Fixup issues found during review by Ian Chapman

* Mon Dec 3 2007 Linus Walleij <triad at df.lth.se> 2.1.1-5
- Fixup issues found during pre-review by Dribble Admin

* Mon Nov 19 2007 Linus Walleij <triad at df.lth.se> 2.1.1-4
- Rebased on the Debian package, which WORKS.

* Sun Sep 18 2005 Linus Walleij <triad at df.lth.se> 2.1.1-3
- Fixed the optimization problem...

* Thu Sep 15 2005 Linus Walleij <triad at df.lth.se> 2.1.1-2
- Fixed dependency on libsidplay.

* Sat Sep 10 2005 Linus Walleij <triad at df.lth.se> 2.1.1-1
- First try at a sidplay-libraries RPM.

sidplay-libs_2.1.1-5.diff:

--- NEW FILE sidplay-libs_2.1.1-5.diff ---
--- sidplay-libs-2.1.1.orig/libsidplay/unix/sidint.h
+++ sidplay-libs-2.1.1/libsidplay/unix/sidint.h
@@ -0,0 +1,17 @@
+#ifndef _UNIX_SIDINT_H
+#define _UNIX_SIDINT_H 1
+#ifndef _GENERATED_STDINT_H
+#define _GENERATED_STDINT_H "libsidplay 2.1.1"
+/* generated using a gnu compiler version i486-linux-gnu-gcc (GCC) 4.0.3 (Debian 4.0.3-1) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+
+#include <stdint.h>
+
+
+/* system headers have good uint64_t */
+#ifndef _HAVE_UINT64_T
+#define _HAVE_UINT64_T
+#endif
+
+  /* once */
+#endif
+#endif
--- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/sidendian.h
+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/sidendian.h
@@ -16,6 +16,10 @@
  ***************************************************************************/
 /***************************************************************************
  *  $Log: sidendian.h,v $
+ *  Revision 1.6  2005/11/20 11:02:06  s_a_white
+ *  Work around for bug in gcc 4 (optimiser breaks if variable never has a
+ *  direct assignment).
+ *
  *  Revision 1.5  2001/07/03 22:44:13  s_a_white
  *  Added endian_16 to convert a 16 bit value to an array of 8s.
  *
@@ -141,7 +145,7 @@
 // Convert high-byte and low-byte to 16-bit word.
 inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
 {
-    uint_least16_t word;
+    uint_least16_t word = 0;
     endian_16lo8 (word, lo);
     endian_16hi8 (word, hi);
     return word;
@@ -165,7 +169,7 @@
 
 inline void endian_16 (char ptr[2], uint_least16_t word)
 {
-	endian_16 ((uint8_t *) ptr, word);
+    endian_16 ((uint8_t *) ptr, word);
 }
 
 // Convert high-byte and low-byte to 16-bit little endian word.
@@ -334,7 +338,7 @@
 // Swap word endian.
 inline void endian_32swap8 (uint_least32_t &dword)
 {
-    uint_least16_t lo, hi;
+    uint_least16_t lo = 0, hi = 0;
     lo = endian_32lo16 (dword);
     hi = endian_32hi16 (dword);
     endian_16swap8 (lo);
@@ -346,8 +350,8 @@
 // Convert high-byte and low-byte to 32-bit word.
 inline uint_least32_t endian_32 (uint8_t hihi, uint8_t hilo, uint8_t hi, uint8_t lo)
 {
-    uint_least32_t dword;
-    uint_least16_t word;
+    uint_least32_t dword = 0;
+    uint_least16_t word  = 0;
     endian_32lo8  (dword, lo);
     endian_32hi8  (dword, hi);
     endian_16lo8  (word,  hilo);
@@ -374,7 +378,7 @@
     defined(SID_WORDS_LITTLEENDIAN)
     *((uint_least32_t *) ptr) = dword;
 #else
-    uint_least16_t word;
+    uint_least16_t word = 0;
     ptr[0] = endian_32lo8  (dword);
     ptr[1] = endian_32hi8  (dword);
     word   = endian_32hi16 (dword);
@@ -401,7 +405,7 @@
     defined(SID_WORDS_BIGENDIAN)
     *((uint_least32_t *) ptr) = dword;
 #else
-    uint_least16_t word;
+    uint_least16_t word = 0;
     word   = endian_32hi16 (dword);
     ptr[1] = endian_16lo8  (word);
     ptr[0] = endian_16hi8  (word);
--- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/SmartPtr.h
+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h
@@ -17,16 +17,16 @@
 		doFree = bufOwner;
 		if ( bufferLen >= 1 )
 		{
-			pBufCurrent = ( bufBegin = buffer );
-			bufEnd = bufBegin + bufferLen;
-			bufLen = bufferLen;
-			status = true;
+			this->pBufCurrent = ( this->bufBegin = buffer );
+			this->bufEnd = this->bufBegin + bufferLen;
+			this->bufLen = bufferLen;
+			this->status = true;
 		}
 		else
 		{
-			pBufCurrent = ( bufBegin = ( bufEnd = 0 ));
-			bufLen = 0;
-			status = false;
+			this->pBufCurrent = ( this->bufBegin = ( this->bufEnd = 0 ));
+			this->bufLen = 0;
+			this->status = false;
 		}
 	}
 	
@@ -211,16 +211,16 @@
 	{
 		if ( bufferLen >= 1 )
 		{
-			pBufCurrent = ( bufBegin = buffer );
-			bufEnd = bufBegin + bufferLen;
-			bufLen = bufferLen;
-			status = true;
+			this->pBufCurrent = ( this->bufBegin = buffer );
+			this->bufEnd = this->bufBegin + bufferLen;
+			this->bufLen = bufferLen;
+			this->status = true;
 		}
 		else
 		{
-			pBufCurrent = bufBegin = bufEnd = 0;
-			bufLen = 0;
-			status = false;
+			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
+			this->bufLen = 0;
+			this->status = false;
 		}
 	}
 };
--- sidplay-libs-2.1.1.orig/libsidutils/include/sidplay/utils/SidUsage.h
+++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h
@@ -33,7 +33,7 @@
     uint_least16_t length;  // usage scan length
 
     // Copy common parts of basic usage to extended usage.
-    sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage)
+    sid2_usage_t &operator= (const sid_usage_t &usage)
     {
         *((sid_usage_t *) this) = usage;
         return *this;
--- sidplay-libs-2.1.1.orig/builders/Makefile.in
+++ sidplay-libs-2.1.1/builders/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -130,9 +130,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  builders/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  builders/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  builders/Makefile
+	  $(AUTOMAKE) --foreign  builders/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -234,7 +234,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -245,7 +245,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
--- sidplay-libs-2.1.1.orig/configure.ac
+++ sidplay-libs-2.1.1/configure.ac
@@ -2,7 +2,7 @@
 
 #Variables
 pwd=`pwd`
-builders='${libdir}'/sidplay/builders
+builders='${libdir}'/
 ac_configure_args="$ac_configure_args --disable-library-checks"
 
 AC_CONFIG_AUX_DIR(unix)
--- sidplay-libs-2.1.1.orig/aclocal.m4
+++ sidplay-libs-2.1.1/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
@@ -40,7 +40,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.4])])
+	 [AM_AUTOMAKE_VERSION([1.8.5])])
 
 # AM_AUX_DIR_EXPAND
 
--- sidplay-libs-2.1.1.orig/Makefile.in
+++ sidplay-libs-2.1.1/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -253,7 +253,7 @@
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
+	    test ! -f $$subdir/TAGS || \
 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
@@ -264,7 +264,7 @@
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
--- sidplay-libs-2.1.1.orig/configure
+++ sidplay-libs-2.1.1/configure
@@ -877,7 +877,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1227,7 +1227,7 @@
 
 #Variables
 pwd=`pwd`
-builders='${libdir}'/sidplay/builders
+builders='${libdir}'/
 ac_configure_args="$ac_configure_args --disable-library-checks"
 
 ac_aux_dir=
@@ -2620,11 +2620,6 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -2663,6 +2658,12 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
--- sidplay-libs-2.1.1.orig/debian/libresid-builder0c2a.dirs
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.dirs
@@ -0,0 +1 @@
+usr/lib
--- sidplay-libs-2.1.1.orig/debian/libsidplay2-dev.dirs
+++ sidplay-libs-2.1.1/debian/libsidplay2-dev.dirs
@@ -0,0 +1,3 @@
+usr/lib
+usr/include
+usr/lib/pkgconfig
--- sidplay-libs-2.1.1.orig/debian/libsidplay2-dev.files
+++ sidplay-libs-2.1.1/debian/libsidplay2-dev.files
@@ -0,0 +1,5 @@
+usr/include/sidplay/*.h
+usr/lib/libsidplay*.a
+usr/lib/libsidplay*.la
+usr/lib/libsidplay*.so
+usr/lib/pkgconfig/libsidplay2.pc
--- sidplay-libs-2.1.1.orig/debian/libsidutils-dev.dirs
+++ sidplay-libs-2.1.1/debian/libsidutils-dev.dirs
@@ -0,0 +1,3 @@
+usr/lib
+usr/include
+usr/lib/pkgconfig
--- sidplay-libs-2.1.1.orig/debian/libsidutils-dev.files
+++ sidplay-libs-2.1.1/debian/libsidutils-dev.files
@@ -0,0 +1,5 @@
+usr/include/sidplay/utils/*
+usr/lib/libsidutils*.a
+usr/lib/libsidutils*.la
+usr/lib/libsidutils*.so
+usr/lib/pkgconfig/libsidutils.pc
--- sidplay-libs-2.1.1.orig/debian/libsidutils0.dirs
+++ sidplay-libs-2.1.1/debian/libsidutils0.dirs
@@ -0,0 +1 @@
+usr/lib
--- sidplay-libs-2.1.1.orig/debian/libsidutils0.files
+++ sidplay-libs-2.1.1/debian/libsidutils0.files
@@ -0,0 +1 @@
+usr/lib/libsidutils*.so.*
--- sidplay-libs-2.1.1.orig/debian/libresid-builder-dev.dirs
+++ sidplay-libs-2.1.1/debian/libresid-builder-dev.dirs
@@ -0,0 +1,2 @@
+usr/lib
+usr/include/sidplay/builders
--- sidplay-libs-2.1.1.orig/debian/libsidplay2.dirs
+++ sidplay-libs-2.1.1/debian/libsidplay2.dirs
@@ -0,0 +1 @@
+usr/lib
--- sidplay-libs-2.1.1.orig/debian/libsidplay2.files
+++ sidplay-libs-2.1.1/debian/libsidplay2.files
@@ -0,0 +1 @@
+usr/lib/libsidplay*.so.*
--- sidplay-libs-2.1.1.orig/debian/watch
+++ sidplay-libs-2.1.1/debian/watch
@@ -0,0 +1,2 @@
+version=2
+http://heanet.dl.sourceforge.net/sourceforge/sidplay2/sidplay-libs-([0-9.]+)\.tar\.gz debian uupdate
--- sidplay-libs-2.1.1.orig/debian/rules
+++ sidplay-libs-2.1.1/debian/rules
@@ -0,0 +1,128 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+export DH_COMPAT=4
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	./configure --enable-shared --enable-static --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+
+
+build: build-stamp
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -rf $(CURDIR)/debian/libsidplay-dev/
+	rm -f $(CURDIR)/config.log $(CURDIR)/libsidplay/config.log
+	-$(MAKE) distclean
+	rm -f build-stamp 
+
+	dh_clean
+
+maintainerclean: clean
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess config.guess
+
+	set -e ; \
+	p=`pwd` ; \
+	for d in . libsidplay libsidutils resid builders/resid-builder ; do \
+		echo $$d ; \
+		cd $$p/$$d ; \
+		libtoolize --force --copy ; \
+		aclocal `test -d unix && echo -I unix` ; \
+		automake --add-missing --copy || true ; \
+		autoconf || true ; \
+	done
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install prefix=$(CURDIR)/debian/tmp/usr
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_movefiles
+
+	install -d -o root -g root -m 755 debian/libsidplay2/usr/share/doc/libsidplay2
+	install -d -o root -g root -m 755 debian/libsidplay2/usr/share/lintian/overrides
+	cp $(CURDIR)/debian/libsidplay2.lintian  $(CURDIR)/debian/libsidplay2/usr/share/lintian/overrides/libsidplay2
+	install -d -o root -g root -m 755 debian/libsidplay-dev/usr/share/doc
+	install -d -o root -g root -m 755 debian/libsidutils0/usr/share/doc/libsidutils0
+	install -d -o root -g root -m 755 debian/libsidutils-dev/usr/share/doc
+	install -d -o root -g root -m 755 debian/libresid-builder0c2a/usr/share/doc/libresid-builder0c2a
+	install -d -o root -g root -m 755 debian/libresid-builder-dev/usr/share/doc
+	ln -s libsidplay2 debian/libsidplay-dev/usr/share/doc/libsidplay-dev
+	ln -s libsidutils0 debian/libsidutils-dev/usr/share/doc/libsidutils-dev
+	ln -s libresid-builder0c2a debian/libresid-builder-dev/usr/share/doc/libresid-builder-dev
+
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installcron
+	dh_installman
+	dh_installinfo
+
+	install -o root -g root -m 644 libsidplay/ChangeLog debian/libsidplay2/usr/share/doc/libsidplay2/changelog
+	install -o root -g root -m 644 libsidutils/ChangeLog debian/libsidutils0/usr/share/doc/libsidutils0/changelog
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- sidplay-libs-2.1.1.orig/debian/copyright
+++ sidplay-libs-2.1.1/debian/copyright
@@ -0,0 +1,26 @@
+This package was debianized by Ivo Timmermans <ivo at debian.org> on
+Mon, 12 Aug 2002 21:35:44 +0200.
+Packaging taken over by Laszlo Boszormenyi <gcs at lsc.hu> on Sun, 15 Aug
+2004 12:48:16 +0000.
+
+It was downloaded from http://sourceforge.net/projects/sidplay2/
+
+Upstream Author: Simon White <sidplay2 at email.com>
+
+Copyright:
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian GNU/Linux systems, the complete text of the GPL is available
+in /usr/share/common-licenses/GPL .
--- sidplay-libs-2.1.1.orig/debian/libsidplay2.lintian
+++ sidplay-libs-2.1.1/debian/libsidplay2.lintian
@@ -0,0 +1 @@
+libsidplay2: package-name-doesnt-match-sonames libsidplay2-1
--- sidplay-libs-2.1.1.orig/debian/changelog
+++ sidplay-libs-2.1.1/debian/changelog
@@ -0,0 +1,80 @@
+sidplay-libs (2.1.1-5) unstable; urgency=low
+
+  * Fix extra qualification, patch by Martin Michlmayr (closes: #357710).
+  * Include hardsid support (closes: #353114).
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Thu, 30 Mar 2006 21:19:47 +0000
+
+sidplay-libs (2.1.1-4) unstable; urgency=low
+
+  * Acknowledge NMU (closes: #339262).
+  * Fix faster playback due to a GCC4 optimisation problem (closes: #337347).
+  * Updated FSF address in copyright.
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Thu,  9 Mar 2006 14:56:14 +0100
+
+sidplay-libs (2.1.1-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Rename libresid-builder0 to libresid-builder0c2a for the C++ mt allocator
+    ABI transition, and conflict/replace libresid-builder0 accordingly
+    (closes: #339262).
+
+ -- Steve Langasek <vorlon at debian.org>  Sun,  4 Dec 2005 03:15:07 -0800
+
+sidplay-libs (2.1.1-3) unstable; urgency=low
+
+  * Drop c102 suffix from the package names due to C++ ABI transition.
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Sat, 16 Jul 2005 20:19:00 +0200
+
+sidplay-libs (2.1.1-2) unstable; urgency=medium
+
+  * Fix FTBFS with g++-3.4 and gcc-4.0 on amd64 systems. Thanks to Daniel
+    Schepler and Andreas Jochens for the proposed fixes.
+  (closes: #283689, #288465).
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Tue,  1 Feb 2005 19:05:47 +0100
+
+sidplay-libs (2.1.1-1) unstable; urgency=low
+
+  * New upstream version (libresid2c102 and libresid-dev packages are now
+    obsolete, and not being built).
+  * Changed email address.
+
+ -- Laszlo Boszormenyi (GCS) <gcs at debian.hu>  Thu, 25 Nov 2004 02:22:07 +0100
+
+sidplay-libs (2.1.0-4) unstable; urgency=medium
+
+  * Move resid libraries back to /usr/lib, as otherwise it would use
+    rpath which should be fixed for sidplay2 linking. Generate shlibs
+    file for the library (again for all of them).
+
+ -- László Böszörményi (GCS) <gcs at lsc.hu>  Mon, 23 Aug 2004 20:55:03 +0000
+
+sidplay-libs (2.1.0-3) unstable; urgency=medium
+
+  * Fix FTBFS with gcc 3.4 (closes: #259823).
+  * Add shlib files only to real libraries installed in /usr/lib.
+  * Cleaned rules a bit.
+  * Bumped up Standards-Version to 3.6.1, no changes needed.
+  * New maintainer.
+
+ -- László Böszörményi (GCS) <gcs at lsc.hu>  Sun, 15 Aug 2004 12:48:16 +0000
+
+sidplay-libs (2.1.0-2) unstable; urgency=low
+
+  * debian/control: Change the libsidutils description.  (Closes: #176671)
+
+ -- Ivo Timmermans <ivo at debian.org>  Sat, 15 Feb 2003 15:46:26 +0100
+
+sidplay-libs (2.1.0-1) unstable; urgency=low
+
+  * New upstream source package, which combines libsidplay, libresid,
+    libsidutils, libresid-builder.
+  * libsidplay2-1 and libresid2 have been renamed to libsidplay2-1c102 and
+    libresid2c102 because of the C++ ABI transition.
+
+ -- Ivo Timmermans <ivo at debian.org>  Sun, 12 Jan 2003 15:35:31 +0100
+
--- sidplay-libs-2.1.1.orig/debian/control
+++ sidplay-libs-2.1.1/debian/control
@@ -0,0 +1,106 @@
+Source: sidplay-libs
+Section: sound
+Priority: optional
+Maintainer: Laszlo Boszormenyi (GCS) <gcs at debian.hu>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.2
+
+Package: libsidplay2-dev
+Section: libdevel
+Architecture: any
+Depends: libsidplay2 (= ${Source-Version})
+Description: SID (MOS 6581) emulation library
+ This is a (shared) library that implements the emulation of the C64's
+ SID chip (MOS 6581) and CPU (6510). It is used by several "player"
+ applications, e.g. sidplay, which make it possible to listen to *really*
+ a lot (13.600+) of tunes, known from old and new C64 programs (as well
+ as Amiga compositions).
+ .
+ Find most of the available musics from your favourite games or demos
+ and more in the High Voltage SID Collection (HVSC). For downloads and
+ information about the volunteers, who maintain the collection, look at
+ the HVSC homepage http://www.hvsc.c64.org.
+
+Package: libsidplay2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2)
+Conflicts: libsidplay2-1, libsidplay2-1c102 (<= 2.1.1-2)
+Description: SID (MOS 6581) emulation library
+ This is a (shared) library that implements the emulation of the C64's
+ SID chip (MOS 6581) and CPU (6510). It is used by several "player"
+ applications, e.g. sidplay, which make it possible to listen to *really*
+ a lot (13.600+) of tunes, known from old and new C64 programs (as well
+ as Amiga compositions).
+ .
+ Find most of the available musics from your favourite games or demos
+ and more in the High Voltage SID Collection (HVSC). For downloads and
+ information about the volunteers, who maintain the collection, look at
+ the HVSC homepage http://www.hvsc.c64.org.
+
+Package: libsidutils-dev
+Section: libdevel
+Architecture: any
+Depends: libsidutils0 (= ${Source-Version})
+Description: utility functions for SID players
+ This library contains various things deemed useful to all SID players
+ (Emulations of the C64's SID chip (MOS 6581) and CPU (6510)), and
+ currently every player seems to be re-inventing. It is used by
+ several "player" applications, e.g. sidplay.
+ .
+ Support so far is:
+ .
+  * INI file reader.
+  * MD5 key creation.
+  * Song length database parser.
+  * Sid filter file parser.
+ .
+ Coming soon:
+ .
+  * Playlist parser (load and save).
+  * STIL parser.
+
+Package: libsidutils0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: utility functions for SID players
+ This library contains various things deemed useful to all SID players
+ (Emulations of the C64's SID chip (MOS 6581) and CPU (6510)), and
+ currently every player seems to be re-inventing. It is used by
+ several "player" applications, e.g. sidplay.
+ .
+ Support so far is:
+ .
+  * INI file reader.
+  * MD5 key creation.
+  * Song length database parser.
+  * Sid filter file parser.
+ .
+ Coming soon:
+ .
+  * Playlist parser (load and save).
+  * STIL parser.
+
+Package: libresid-builder-dev
+Section: libdevel
+Architecture: any
+Depends: libresid-builder0c2a (= ${Source-Version})
+Replaces: libresid-dev (<= 2.1.0)
+Conflicts: libresid-dev (<= 2.1.0)
+Description: SID chip emulation class based on resid
+ SID builder packages provide a chip emulator, to be used by libsidplay2.
+ This package is an emulation based on the resid library, including hardsid
+ support.
+
+Package: libresid-builder0c2a
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libresid2c102 (<= 2.1.1-2), libresid-builder0
+Conflicts: libresid2c102 (<= 2.1.1-2), libresid-builder0
+Description: SID chip emulation class based on resid
+ SID builder packages provide a chip emulator, to be used by libsidplay2.
+ This package is an emulation based on the resid library, including hardsid
+ support.
--- sidplay-libs-2.1.1.orig/debian/libresid-builder-dev.files
+++ sidplay-libs-2.1.1/debian/libresid-builder-dev.files
@@ -0,0 +1,9 @@
+usr/include/sidplay/builders/resid.h
+usr/include/sidplay/builders/hardsid.h
+usr/lib/libresid-builder.a
+usr/lib/libresid-builder.la
+usr/lib/libresid-builder.so
+usr/lib/libhardsid-builder.so
+usr/lib/libhardsid-builder.la
+usr/lib/libhardsid-builder.a
+
--- sidplay-libs-2.1.1.orig/debian/libresid-builder0c2a.files
+++ sidplay-libs-2.1.1/debian/libresid-builder0c2a.files
@@ -0,0 +1,2 @@
+usr/lib/libresid-builder.so.*
+usr/lib/libhardsid-builder.so.*


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay-libs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Jun 2008 16:06:18 -0000	1.1
+++ .cvsignore	10 Nov 2008 23:53:27 -0000	1.2
@@ -0,0 +1 @@
+sidplay-libs-2.1.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay-libs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Jun 2008 16:06:18 -0000	1.1
+++ sources	10 Nov 2008 23:53:27 -0000	1.2
@@ -0,0 +1 @@
+7ea0ba5dc1da4604d15eaae001f7d2a7  sidplay-libs-2.1.1.tar.gz



More information about the rpmfusion-commits mailing list