[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [livid-dev] release todo
On Thu, 8 Feb 2001, David I. Lehn wrote:
> Todo:
> o update code so "make dist" will build working tarballs.
I'm not sure if everyone else is having the same problems with the
tarballs that I had. Anyway, at least for me the solution was easy, see
the attached patches.
I made three changes:
- in both top-level Makefile.am's, the directory autotools was included,
which does not work and must be removed from the list or in case of OMS
replaced by the files in the directory (unlike the description in the
automake documentation!)
- There are two files called mm_accel.h in OMS, one of which is broken.
The bug shows up only in the generated tarball
- When dist/redhat/pkg.spec is included in the tarball, you can create
the RPM with 'rpm -ta om?.tar.gz' instead of 'tar && configure &&
make dist_rpm'. Just for convenience.
> o update rpm info so rpms build and work.
The spec files already build and work correctly, I just made
RPMS for Mandrake 7.2 on 686 and k6, but the new Documentation
still has to be added to them.
The bigger problem, at least for Mandrake, is that the dependencies are
not met by the standard distribution. OMS needs libXv.so, which simply
is not there, and RPMS for SDL are only available in versions 1.1.4
and 1.1.7, unfortunately both are not working with OMS...
Arnd <><
Index: Makefile.am
===================================================================
RCS file: /cvs/livid/omi/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am 2001/02/06 05:55:37 1.3
+++ Makefile.am 2001/02/09 07:07:11
@@ -4,7 +4,7 @@
SUBDIRS = autotools src dist skins script
-EXTRA_DIST = FAQ acconfig.h autotools/
+EXTRA_DIST = FAQ acconfig.h
install-data-local:
Index: dist/redhat/Makefile.am
===================================================================
RCS file: /cvs/livid/omi/dist/redhat/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- dist/redhat/Makefile.am 2001/01/05 13:28:28 1.1.1.1
+++ dist/redhat/Makefile.am 2001/02/09 07:07:12
@@ -1,3 +1,5 @@
+EXTRA_DIST = pkg.spec
+
clean-generic:
rm -rf BUILD SPECS RPMS SOURCES SRPMS
rm -f rpmrc rpmmacros
Index: Makefile.am
===================================================================
RCS file: /cvs/livid/oms/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- Makefile.am 2001/01/09 21:45:05 1.15
+++ Makefile.am 2001/02/09 06:56:11
@@ -4,7 +4,14 @@
SUBDIRS = dist script include src
-EXTRA_DIST = FAQ acconfig.h autotools/
+EXTRA_DIST = FAQ acconfig.h autotools/acconfig.h autotools/mkinstalldirs \
+ autotools/acconfig.h.incl autotools/config.sub autotools/missing \
+ autotools/install-sh autotools/config.guess \
+ autotools/ltconfig autotools/ltmain.sh \
+ oms.m4 \
+ man/oms.1
+
+#autotools/
m4datadir = $(datadir)/aclocal
m4data_DATA = oms.m4
Index: dist/redhat/Makefile.am
===================================================================
RCS file: /cvs/livid/oms/dist/redhat/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- dist/redhat/Makefile.am 2001/01/05 18:02:00 1.3
+++ dist/redhat/Makefile.am 2001/02/09 06:56:13
@@ -1,3 +1,5 @@
+EXTRA_DIST = pkg.spec
+
clean-generic:
rm -rf BUILD SPECS RPMS SOURCES SRPMS
rm -f rpmrc rpmmacros
Index: include/mm_accel.h
===================================================================
RCS file: /cvs/livid/oms/include/mm_accel.h,v
retrieving revision 1.2
diff -u -r1.2 mm_accel.h
--- include/mm_accel.h 2001/01/05 18:02:00 1.2
+++ include/mm_accel.h 2001/02/09 06:56:13
@@ -1,13 +1,15 @@
#ifndef __MM_ACCEL_H__
#define __MM_ACCEL_H__
+#include <inttypes.h>
+
// generic accelerations
#define MM_ACCEL_MLIB 0x00000001
// x86 accelerations
-#define MM_ACCEL_X86_MMXEXT 0x20000000
-#define MM_ACCEL_X86_3DNOW 0x40000000
#define MM_ACCEL_X86_MMX 0x80000000
+#define MM_ACCEL_X86_3DNOW 0x40000000
+#define MM_ACCEL_X86_MMXEXT 0x20000000
uint32_t mm_accel (void);