ports/112299: Dvbcut and make patch errors

[Ganael LAPLANCHE]

>Number:         112299
>Category:       ports
>Synopsis:       Dvbcut and make patch errors
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 01 13:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Ganael LAPLANCHE
>Release:        6.2-STABLE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 6.2-STABLE FreeBSD 6.2-STABLE #0: Mon Apr 30 17:59:07 CEST 2007     martymac at home.martymac.com:/usr/src/sys/amd64/compile/MYKERNEL  amd64
>Description:
Dvbcut patches fail to apply cleanly on dvbcut-0.5.4 because some of the patches seem to have been included in the main code.
>How-To-Repeat:
cd /usr/ports/multimedia/dvbcut && make patch
>Fix:
Use the attached shar file for the 'files' directory of the dvbcut port

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files
#	files/patch-Makefile
#	files/patch-SConstruct
#	files/patch-defines.h
#	files/patch-index.h
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-Makefile
sed 's/^X//' >files/patch-Makefile << 'END-of-files/patch-Makefile'
X--- Makefile~	Tue Dec  6 08:57:49 2005
X+++ Makefile	Thu Dec 29 00:19:02 2005
X@@ -2,7 +2,9 @@
X 
X build:
X 	scons $(if $(FFMPEG),FFMPEG=$(FFMPEG)) \
X-		$(if $(DEBUG),DEBUG=$(DEBUG))
X+		$(if $(DEBUG),DEBUG=$(DEBUG)) \
X+		$(if $(CFLAGS),CFLAGS="$(CFLAGS)") \
X+		$(if $(LDFLAGS),LDFLAGS="$(LDFLAGS)")
X 
X clean:
X 	scons --clean
END-of-files/patch-Makefile
echo x - files/patch-SConstruct
sed 's/^X//' >files/patch-SConstruct << 'END-of-files/patch-SConstruct'
X--- SConstruct~	Sun Dec 11 12:07:09 2005
X+++ SConstruct	Thu Dec 29 00:19:48 2005
X@@ -38,13 +38,17 @@
X 
X ###### BUILD ENVIRONMENT
X 
X+opts.Add('CFLAGS','compiler flags', "-O3 -Wall")
X+opts.Add('LDFLAGS','linker flags', "")
X+
X env=Environment(options=opts, ENV=os.environ)
X debug=int(env['DEBUG'])
X 
X if (debug>0):
X   env.Append(CCFLAGS=['-g3','-Wall'])
X-else:
X-  env.Append(CCFLAGS=['-O3','-Wall'])
X+env.Append(CCFLAGS=Split(env["CFLAGS"]))
X+
X+env.Append(LINKFLAGS=Split(env["LDFLAGS"]))
X 
X env.Replace(CXXFILESUFFIX=".cpp")
X 
END-of-files/patch-SConstruct
echo x - files/patch-defines.h
sed 's/^X//' >files/patch-defines.h << 'END-of-files/patch-defines.h'
X--- src/defines.h.orig	Fri Apr 13 19:36:26 2007
X+++ src/defines.h	Tue May  1 14:25:07 2007
X@@ -40,6 +40,12 @@
X #endif
X   }
X 
X+#if defined(__FreeBSD__)
X+#define mbo32(x) htobe32(x)
X+#define htom32(x) htobe32(x)
X+#define mbo16(x) htobe16(x)
X+#define htom16(x) htobe16(x)
X+#else
X #if __BYTE_ORDER == __LITTLE_ENDIAN
X #define mbo32(x) \
X       ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
X@@ -52,6 +58,7 @@
X #define htom32(x) (x)
X #define mbo16(x) (x)
X #define htom16(x) (x)
X+#endif
X #endif
X 
X #define DVBCUT_QSETTINGS_DOMAIN "dvbcut.sf.net"
END-of-files/patch-defines.h
echo x - files/patch-index.h
sed 's/^X//' >files/patch-index.h << 'END-of-files/patch-index.h'
X--- src/index.h.orig	Fri Apr 13 19:36:26 2007
X+++ src/index.h	Tue May  1 14:32:01 2007
X@@ -20,7 +20,11 @@
X #define _DVBCUT_INDEX_H
X 
X #include <stdint.h>
X+#if defined(__FreeBSD__)
X+#include <sys/endian.h>
X+#else
X #include <byteswap.h>
X+#endif
X #include "types.h"
X #include "pts.h"
X #include "defines.h"
END-of-files/patch-index.h
exit


>Release-Note:
>Audit-Trail:
>Unformatted: