This didn't make it over to the , so I can only assume that Mauro isn't subscribed using that email address. Anyhow, this announcement applies to everybody, so please read: Mauro Carvalho Chehab wrote: >Dear DVB and V4L developers and users, > > We are proud to announce that both project trees will be joined. > > This will allow a faster development of hybrid analog and DVB cards and >help to eliminate changes on one tree that breaks the other tree. > > From V4L side, we've made several efforts in the recent past to >restructure the V4L tree to be similar to the DVB tree. > > After the trees haven been merged, all analog and digital stuff in >drivers/media/ can be build with a single make invocation. > > For this strategy have success, we'll need also to freeze both trees >and submit pending bug fixes to kernel tree. So, the basic idea is: > > 1) to freeze both v4l-kernel and dvb-kernel trees; > > 2) generate pending patches. If the patches are bug fixes, submit to >kernel; > > 3) patches not sent will be available at linuxtv download area and will >be send with the rest to 2.6.16 or to stay for a while at -mm series; > > 4) create the merging tree, freezed for about one week. The only >allowed patches are patches meant to fix or improve tree merging and >building. All other patches should be directed to V4L mailing list >(video4linux@xxxxxxxxxx), if are meant to analog or generic multimedia >they support or to DVB mailing list for digital TV support >(linux-dvb@xxxxxxxxxxx). > > Both mailing lists will be available. > >Cheers, > >Mauro Carvalho Chehab Johannes Stezenbach >V4L maintainer DVB maintainer > ...and I would like to add, that users can get an idea of how this merged tree will build by using v4l-kernel's "make merge-trees" command. As an intermediate step, I have added dvb-core and all of the other dvb-kernel modules into the v4l/dvb merged build environment. 'make merge-trees && make' will now build every module from v4l-kernel AND dvb-kernel. cvs -d :pserver:anonymous@xxxxxxxxxxxxxxx:/cvs/video4linux login cvs -d :pserver:anonymous@xxxxxxxxxxxxxxx:/cvs/video4linux co v4l-kernel cvs -d :pserver:anonymous@xxxxxxxxxxxxxxx:/cvs/linuxtv login cvs -z3 -d :pserver:anonymous@xxxxxxxxxxxxxxx:/cvs/linuxtv co -P dvb-kernel cd v4l-kernel make merge-trees && make make install ...After we're done with the merge, the 'make merge-trees' command will no longer be necessary... The new, merged cvs tree will behave similar to that of the merged v4l/dvb build environment. Cheers, Michael Krufky
