On Thu, Mar 24, 2011 at 08:24:55PM +0100, Landry Breuil wrote: > On Wed, Mar 23, 2011 at 09:13:31PM +0000, Edd Barrett wrote: > > On Wed, Mar 23, 2011 at 12:23:21PM -0400, Brad wrote: > > > Read the content of both URLs in context... they both refer to the MythTV > > > project. > > > > Fixed version string, new diff attached. I really think this is ready. > > Jakemsr@ has tested all dependent ports and I have tested this > > i386/amd64/sparc64. It has even been tested on loongson by phessler@. > > > > I am getting restless as I will not have much time to hack on bsd stuff > > for the next couple of months and i don't want to allow the diff to rot > > (also > > mplayer is to follow after a little more work). > > > > Lets get this in people, Brad, let's go. Anyone willing to OK? > > fwiw, this doesn't build on ppc. Added sys/types.h, doesn't help. > > Landry
> ===> Building for ffmpeg-20110306 > echo "#define FFMPEG_VERSION \"git-f4f4e12\"" > > "/usr/obj/ports/ffmpeg-20110306/ffmpeg-git-20110306"/version.h > cc -I. -I"/usr/obj/ports/ffmpeg-20110306/ffmpeg-git-20110306" > -I/usr/X11R6/include -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 > -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPIC -DHAVE_AV_CONFIG_H -O2 -pipe > -Wall -I/usr/local/include -I/usr/X11R6/include -std=c99 -fPIC -pthread > -I/usr/local/include/schroedinger-1.0 -I/usr/local/include/orc-0.4 > -Wdeclaration-after-statement -Wall -Wno-parentheses -Wno-switch > -Wdisabled-optimization -Wpointer-arith -Wredundant-decls -Wno-pointer-sign > -Wcast-qual -Wwrite-strings -Wundef -Wmissing-prototypes -fno-math-errno > -fno-tree-vectorize -Werror=implicit-function-declaration > -Werror=missing-prototypes -MMD -MF libavutil/ppc/cpu.d -MT > libavutil/ppc/cpu.o -c -o libavutil/ppc/cpu.o libavutil/ppc/cpu.c > In file included from /usr//include/sys/sysctl.h:46, > from libavutil/ppc/cpu.c:24: > /usr//include/sys/ucred.h:42: error: expected specifier-qualifier-list before > 'u_int' > In file included from /usr//include/sys/selinfo.h:37, > from /usr//include/sys/proc.h:44, > from /usr//include/sys/sysctl.h:47, > from libavutil/ppc/cpu.c:24: > /usr//include/sys/event.h:54: error: expected specifier-qualifier-list before > 'u_int' > In file included from /usr//include/sys/sysctl.h:47, > from libavutil/ppc/cpu.c:24: > /usr//include/sys/proc.h:91: error: expected ')' before 'int' > /usr//include/sys/proc.h:92: error: expected ';' before 'int' > /usr//include/sys/proc.h:221: error: expected specifier-qualifier-list before > 'u_char' > In file included from /usr//include/sys/sysctl.h:51, > from libavutil/ppc/cpu.c:24: > /usr//include/sys/resourcevar.h:55: error: expected specifier-qualifier-list > before 'u_long' > In file included from /usr//include/uvm/uvm_param.h:71, > from /usr//include/uvm/uvm_extern.h:388, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/machine/vmparam.h:94: error: expected '=', ',', ';', 'asm' or > '__attribute__' before 'ppc_kvm_stolen' > In file included from /usr//include/uvm/uvm_extern.h:389, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/sys/lock.h:72: error: expected specifier-qualifier-list before > 'u_int' > /usr//include/sys/lock.h:166: error: expected declaration specifiers or '...' > before 'u_int' > In file included from /usr//include/uvm/uvm_extern.h:391, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/uvm/uvm_page.h:110: error: expected specifier-qualifier-list > before 'u_int' > /usr//include/uvm/uvm_page.h:200: error: expected specifier-qualifier-list > before 'paddr_t' > In file included from /usr//include/machine/pmap.h:3, > from /usr//include/uvm/uvm_pmap.h:86, > from /usr//include/uvm/uvm_extern.h:392, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/powerpc/pmap.h:44: error: expected '=', ',', ';', 'asm' or > '__attribute__' before 'sr_t' > /usr//include/powerpc/pmap.h:75: error: expected ')' before 'va' > /usr//include/powerpc/pmap.h:76: error: expected ')' before 'va' > In file included from /usr//include/uvm/uvm_extern.h:393, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/uvm/uvm_map.h:137: error: expected specifier-qualifier-list > before 'vaddr_t' > /usr//include/uvm/uvm_map.h:224: error: expected specifier-qualifier-list > before 'vsize_t' > In file included from /usr//include/uvm/uvm_extern.h:394, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/uvm/uvm_fault.h:61: error: expected specifier-qualifier-list > before 'vaddr_t' > In file included from /usr//include/uvm/uvm_extern.h:395, > from /usr//include/sys/sysctl.h:53, > from libavutil/ppc/cpu.c:24: > /usr//include/uvm/uvm_pager.h:93: error: expected declaration specifiers or > '...' before 'vaddr_t' > In file included from libavutil/ppc/cpu.c:24: > /usr//include/sys/sysctl.h:1001: error: expected declaration specifiers or > '...' before 'u_int' > In file included from /usr//include/machine/frame.h:3, > from /usr//include/powerpc/cpu.h:37, > from /usr//include/machine/cpu.h:37, > from libavutil/ppc/cpu.c:25: > /usr//include/powerpc/frame.h:43: error: expected specifier-qualifier-list > before 'register_t' > /usr//include/powerpc/frame.h:52: error: expected specifier-qualifier-list > before 'register_t' > /usr//include/powerpc/frame.h:62: error: expected specifier-qualifier-list > before 'register_t' > In file included from /usr//include/powerpc/cpu.h:41, > from /usr//include/machine/cpu.h:37, > from libavutil/ppc/cpu.c:25: > /usr//include/sys/sched.h:99: error: expected specifier-qualifier-list before > 'u_int' > In file included from /usr//include/machine/cpu.h:37, > from libavutil/ppc/cpu.c:25: > /usr//include/powerpc/cpu.h:65: error: expected specifier-qualifier-list > before 'register_t' > /usr//include/powerpc/cpu.h: In function 'ppc_mftb': > /usr//include/powerpc/cpu.h:303: error: 'u_long' undeclared (first use in > this function) > /usr//include/powerpc/cpu.h:303: error: (Each undeclared identifier is > reported only once > /usr//include/powerpc/cpu.h:303: error: for each function it appears in.) > /usr//include/powerpc/cpu.h:303: error: expected ';' before 'scratch' > /usr//include/powerpc/cpu.h:304: warning: ISO C90 forbids mixed declarations > and code > /usr//include/powerpc/cpu.h:307: error: 'scratch' undeclared (first use in > this function) > /usr//include/powerpc/cpu.h:306: error: invalid lvalue in asm output 1 > In file included from libavutil/ppc/cpu.c:25: > /usr//include/machine/cpu.h: At top level: > /usr//include/machine/cpu.h:54: warning: parameter names (without types) in > function declaration > gmake: *** [libavutil/ppc/cpu.o] Error 1 > *** Error code 2 > > Stop in /usr/ports/mystuff/graphics/ffmpeg (line 2473 of > /usr/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /usr/ports/mystuff/graphics/ffmpeg (line 2241 of > /usr/ports/infrastructure/mk/bsd.port.mk). ugh. does this fix it? or maybe like __APPLE__, _POSIX_C_SOURCE should be undefined? -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org $OpenBSD$ --- libavutil/ppc/cpu.c.orig Thu Mar 24 12:36:27 2011 +++ libavutil/ppc/cpu.c Thu Mar 24 12:37:02 2011 @@ -20,6 +20,7 @@ #undef _POSIX_C_SOURCE #include <sys/sysctl.h> #elif defined(__OpenBSD__) +#define _BSD_SOURCE #include <sys/param.h> #include <sys/sysctl.h> #include <machine/cpu.h>
